changed to 64 (gtk_clist_draw_focus) (hadjustment_value_changed)

Mon Feb  8 21:00:20 1999  Lars Hamann  <lars@gtk.org>

	* gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
	(gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
 	few fixes to respect GTK_CAN_FOCUS flag.

	* gtk/gtkctree.c (draw_row):
 	respect GTK_CAN_FOCUS flag.
This commit is contained in:
Lars Hamann 1999-02-08 21:03:54 +00:00 committed by Lars Hamann
parent e95b3635e8
commit b43de0cbda
9 changed files with 75 additions and 9 deletions

View File

@ -1,3 +1,12 @@
Mon Feb 8 21:00:20 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
(gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
few fixes to respect GTK_CAN_FOCUS flag.
* gtk/gtkctree.c (draw_row):
respect GTK_CAN_FOCUS flag.
Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org> Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org>
* example/colorsel/*: missing from the CVS for some reason * example/colorsel/*: missing from the CVS for some reason

View File

@ -1,3 +1,12 @@
Mon Feb 8 21:00:20 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
(gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
few fixes to respect GTK_CAN_FOCUS flag.
* gtk/gtkctree.c (draw_row):
respect GTK_CAN_FOCUS flag.
Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org> Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org>
* example/colorsel/*: missing from the CVS for some reason * example/colorsel/*: missing from the CVS for some reason

View File

@ -1,3 +1,12 @@
Mon Feb 8 21:00:20 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
(gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
few fixes to respect GTK_CAN_FOCUS flag.
* gtk/gtkctree.c (draw_row):
respect GTK_CAN_FOCUS flag.
Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org> Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org>
* example/colorsel/*: missing from the CVS for some reason * example/colorsel/*: missing from the CVS for some reason

View File

@ -1,3 +1,12 @@
Mon Feb 8 21:00:20 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
(gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
few fixes to respect GTK_CAN_FOCUS flag.
* gtk/gtkctree.c (draw_row):
respect GTK_CAN_FOCUS flag.
Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org> Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org>
* example/colorsel/*: missing from the CVS for some reason * example/colorsel/*: missing from the CVS for some reason

View File

@ -1,3 +1,12 @@
Mon Feb 8 21:00:20 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
(gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
few fixes to respect GTK_CAN_FOCUS flag.
* gtk/gtkctree.c (draw_row):
respect GTK_CAN_FOCUS flag.
Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org> Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org>
* example/colorsel/*: missing from the CVS for some reason * example/colorsel/*: missing from the CVS for some reason

View File

@ -1,3 +1,12 @@
Mon Feb 8 21:00:20 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
(gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
few fixes to respect GTK_CAN_FOCUS flag.
* gtk/gtkctree.c (draw_row):
respect GTK_CAN_FOCUS flag.
Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org> Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org>
* example/colorsel/*: missing from the CVS for some reason * example/colorsel/*: missing from the CVS for some reason

View File

@ -1,3 +1,12 @@
Mon Feb 8 21:00:20 1999 Lars Hamann <lars@gtk.org>
* gtk/gtkclist.c (CLIST_OPTIMUM_SIZE): changed to 64
(gtk_clist_draw_focus) (hadjustment_value_changed) (draw_row):
few fixes to respect GTK_CAN_FOCUS flag.
* gtk/gtkctree.c (draw_row):
respect GTK_CAN_FOCUS flag.
Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org> Mon Feb 8 19:22:27 GMT 1999 Tony Gale <gale@gtk.org>
* example/colorsel/*: missing from the CVS for some reason * example/colorsel/*: missing from the CVS for some reason

View File

@ -5886,7 +5886,8 @@ draw_row (GtkCList *clist,
} }
/* draw focus rectangle */ /* draw focus rectangle */
if (clist->focus_row == row && GTK_WIDGET_HAS_FOCUS(widget)) if (clist->focus_row == row &&
GTK_WIDGET_CAN_FOCUS (widget) && GTK_WIDGET_HAS_FOCUS(widget))
{ {
if (!area) if (!area)
gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE, gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
@ -6256,8 +6257,8 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
return; return;
} }
if (GTK_WIDGET_HAS_FOCUS(clist) && !GTK_CLIST_CHILD_HAS_FOCUS(clist) && if (GTK_WIDGET_CAN_FOCUS(clist) && GTK_WIDGET_HAS_FOCUS(clist) &&
GTK_CLIST_ADD_MODE(clist)) !GTK_CLIST_CHILD_HAS_FOCUS(clist) && GTK_CLIST_ADD_MODE(clist))
{ {
y = ROW_TOP_YPIXEL (clist, clist->focus_row); y = ROW_TOP_YPIXEL (clist, clist->focus_row);
@ -6291,8 +6292,8 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
return; return;
} }
if (GTK_WIDGET_HAS_FOCUS(clist) && !GTK_CLIST_CHILD_HAS_FOCUS(clist) && if (GTK_WIDGET_CAN_FOCUS(clist) && GTK_WIDGET_HAS_FOCUS(clist) &&
GTK_CLIST_ADD_MODE(clist)) !GTK_CLIST_CHILD_HAS_FOCUS(clist) && GTK_CLIST_ADD_MODE(clist))
{ {
y = ROW_TOP_YPIXEL (clist, clist->focus_row); y = ROW_TOP_YPIXEL (clist, clist->focus_row);
@ -6319,7 +6320,8 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
check_exposures (clist); check_exposures (clist);
if (GTK_WIDGET_HAS_FOCUS(clist) && !GTK_CLIST_CHILD_HAS_FOCUS(clist)) if (GTK_WIDGET_CAN_FOCUS(clist) && GTK_WIDGET_HAS_FOCUS(clist) &&
!GTK_CLIST_CHILD_HAS_FOCUS(clist))
{ {
if (GTK_CLIST_ADD_MODE(clist)) if (GTK_CLIST_ADD_MODE(clist))
{ {
@ -6618,7 +6620,7 @@ gtk_clist_draw_focus (GtkWidget *widget)
g_return_if_fail (widget != NULL); g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget)); g_return_if_fail (GTK_IS_CLIST (widget));
if (!GTK_WIDGET_DRAWABLE (widget)) if (!GTK_WIDGET_DRAWABLE (widget) || !GTK_WIDGET_CAN_FOCUS (widget))
return; return;
clist = GTK_CLIST (widget); clist = GTK_CLIST (widget);

View File

@ -32,7 +32,7 @@
#define PM_SIZE 8 #define PM_SIZE 8
#define TAB_SIZE (PM_SIZE + 6) #define TAB_SIZE (PM_SIZE + 6)
#define CELL_SPACING 1 #define CELL_SPACING 1
#define CLIST_OPTIMUM_SIZE 512 #define CLIST_OPTIMUM_SIZE 64
#define COLUMN_INSET 3 #define COLUMN_INSET 3
#define DRAG_WIDTH 6 #define DRAG_WIDTH 6
@ -1956,7 +1956,8 @@ draw_row (GtkCList *clist,
} }
/* draw focus rectangle */ /* draw focus rectangle */
if (clist->focus_row == row && GTK_WIDGET_HAS_FOCUS (widget)) if (clist->focus_row == row &&
GTK_WIDGET_CAN_FOCUS (widget) && GTK_WIDGET_HAS_FOCUS (widget))
{ {
if (!area) if (!area)
gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE, gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,