Commit b43de0cb authored by Lars Hamann's avatar Lars Hamann Committed by Lars Hamann
Browse files

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.
parent e95b3635
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>
* example/colorsel/*: missing from the CVS for some reason
......
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>
* example/colorsel/*: missing from the CVS for some reason
......
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>
* example/colorsel/*: missing from the CVS for some reason
......
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>
* example/colorsel/*: missing from the CVS for some reason
......
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>
* example/colorsel/*: missing from the CVS for some reason
......
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>
* example/colorsel/*: missing from the CVS for some reason
......
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>
* example/colorsel/*: missing from the CVS for some reason
......
......@@ -5886,7 +5886,8 @@ draw_row (GtkCList *clist,
}
/* 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)
gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
......@@ -6256,8 +6257,8 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
return;
}
if (GTK_WIDGET_HAS_FOCUS(clist) && !GTK_CLIST_CHILD_HAS_FOCUS(clist) &&
GTK_CLIST_ADD_MODE(clist))
if (GTK_WIDGET_CAN_FOCUS(clist) && GTK_WIDGET_HAS_FOCUS(clist) &&
!GTK_CLIST_CHILD_HAS_FOCUS(clist) && GTK_CLIST_ADD_MODE(clist))
{
y = ROW_TOP_YPIXEL (clist, clist->focus_row);
......@@ -6291,8 +6292,8 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
return;
}
if (GTK_WIDGET_HAS_FOCUS(clist) && !GTK_CLIST_CHILD_HAS_FOCUS(clist) &&
GTK_CLIST_ADD_MODE(clist))
if (GTK_WIDGET_CAN_FOCUS(clist) && GTK_WIDGET_HAS_FOCUS(clist) &&
!GTK_CLIST_CHILD_HAS_FOCUS(clist) && GTK_CLIST_ADD_MODE(clist))
{
y = ROW_TOP_YPIXEL (clist, clist->focus_row);
......@@ -6319,7 +6320,8 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
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))
{
......@@ -6618,7 +6620,7 @@ gtk_clist_draw_focus (GtkWidget *widget)
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_CLIST (widget));
if (!GTK_WIDGET_DRAWABLE (widget))
if (!GTK_WIDGET_DRAWABLE (widget) || !GTK_WIDGET_CAN_FOCUS (widget))
return;
clist = GTK_CLIST (widget);
......
......@@ -32,7 +32,7 @@
#define PM_SIZE 8
#define TAB_SIZE (PM_SIZE + 6)
#define CELL_SPACING 1
#define CLIST_OPTIMUM_SIZE 512
#define CLIST_OPTIMUM_SIZE 64
#define COLUMN_INSET 3
#define DRAG_WIDTH 6
......@@ -1956,7 +1956,8 @@ draw_row (GtkCList *clist,
}
/* 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)
gdk_draw_rectangle (clist->clist_window, clist->xor_gc, FALSE,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment