callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now we return a GtkVisibility value, instead of a simple boolean. Also,

Browse Source 
1998-03-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* gtk/gtkclist.c (gtk_clist_row_is_visible): Now we return a
	GtkVisibility value, instead of a simple boolean.  Also, changed
	all the functions that expected a boolean value to use
	"!= GTK_VISIBILITY_NONE".

	* gtk/gtkclist.h: Changed prototype for gtk_clist_row_is_visible().

	* gtk/gtkenums.h (enum): Added GtkVisibility enum.
This commit is contained in:
Federico Mena Quintero 1998-03-14 00:07:36 +00:00 committed by Arturo Espinosa
parent 78290be1c0
commit 3ef2c37a83
10 changed files with 120 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
1998-03-13 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkclist.c (gtk_clist_row_is_visible): Now we return a
GtkVisibility value, instead of a simple boolean. Also, changed
all the functions that expected a boolean value to use
"!= GTK_VISIBILITY_NONE".
* gtk/gtkclist.h: Changed prototype for gtk_clist_row_is_visible().
* gtk/gtkenums.h (enum): Added GtkVisibility enum.
Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org> Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* docs/gtk_tut.sgml: * docs/gtk_tut.sgml:

11
ChangeLog.pre-2-0
View File

@ -1,3 +1,14 @@
1998-03-13 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkclist.c (gtk_clist_row_is_visible): Now we return a
GtkVisibility value, instead of a simple boolean. Also, changed
all the functions that expected a boolean value to use
"!= GTK_VISIBILITY_NONE".
* gtk/gtkclist.h: Changed prototype for gtk_clist_row_is_visible().
* gtk/gtkenums.h (enum): Added GtkVisibility enum.
Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org> Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* docs/gtk_tut.sgml: * docs/gtk_tut.sgml:

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
1998-03-13 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkclist.c (gtk_clist_row_is_visible): Now we return a
GtkVisibility value, instead of a simple boolean. Also, changed
all the functions that expected a boolean value to use
"!= GTK_VISIBILITY_NONE".
* gtk/gtkclist.h: Changed prototype for gtk_clist_row_is_visible().
* gtk/gtkenums.h (enum): Added GtkVisibility enum.
Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org> Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* docs/gtk_tut.sgml: * docs/gtk_tut.sgml:

11
ChangeLog.pre-2-2
View File

@ -1,3 +1,14 @@
1998-03-13 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkclist.c (gtk_clist_row_is_visible): Now we return a
GtkVisibility value, instead of a simple boolean. Also, changed
all the functions that expected a boolean value to use
"!= GTK_VISIBILITY_NONE".
* gtk/gtkclist.h: Changed prototype for gtk_clist_row_is_visible().
* gtk/gtkenums.h (enum): Added GtkVisibility enum.
Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org> Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* docs/gtk_tut.sgml: * docs/gtk_tut.sgml:

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
1998-03-13 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkclist.c (gtk_clist_row_is_visible): Now we return a
GtkVisibility value, instead of a simple boolean. Also, changed
all the functions that expected a boolean value to use
"!= GTK_VISIBILITY_NONE".
* gtk/gtkclist.h: Changed prototype for gtk_clist_row_is_visible().
* gtk/gtkenums.h (enum): Added GtkVisibility enum.
Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org> Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* docs/gtk_tut.sgml: * docs/gtk_tut.sgml:

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
1998-03-13 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkclist.c (gtk_clist_row_is_visible): Now we return a
GtkVisibility value, instead of a simple boolean. Also, changed
all the functions that expected a boolean value to use
"!= GTK_VISIBILITY_NONE".
* gtk/gtkclist.h: Changed prototype for gtk_clist_row_is_visible().
* gtk/gtkenums.h (enum): Added GtkVisibility enum.
Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org> Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* docs/gtk_tut.sgml: * docs/gtk_tut.sgml:

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
1998-03-13 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtkclist.c (gtk_clist_row_is_visible): Now we return a
GtkVisibility value, instead of a simple boolean. Also, changed
all the functions that expected a boolean value to use
"!= GTK_VISIBILITY_NONE".
* gtk/gtkclist.h: Changed prototype for gtk_clist_row_is_visible().
* gtk/gtkenums.h (enum): Added GtkVisibility enum.
Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org> Fri Mar 13 11:23:55 PST 1998 Shawn T. Amundson <amundson@gimp.org>
* docs/gtk_tut.sgml: * docs/gtk_tut.sgml:

47
gtk/gtkclist.c
View File

@ -960,7 +960,7 @@ gtk_clist_set_text (GtkCList * clist,
/* redraw the list if it's not frozen */ /* redraw the list if it's not frozen */
if (!GTK_CLIST_FROZEN (clist)) if (!GTK_CLIST_FROZEN (clist))
{ {
if (gtk_clist_row_is_visible (clist, row)) if (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE)
draw_row (clist, NULL, row, clist_row); draw_row (clist, NULL, row, clist_row);
} }
} }
@ -1018,7 +1018,7 @@ gtk_clist_set_pixmap (GtkCList * clist,
/* redraw the list if it's not frozen */ /* redraw the list if it's not frozen */
if (!GTK_CLIST_FROZEN (clist)) if (!GTK_CLIST_FROZEN (clist))
{ {
if (gtk_clist_row_is_visible (clist, row)) if (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE)
draw_row (clist, NULL, row, clist_row); draw_row (clist, NULL, row, clist_row);
} }
} }
@ -1081,7 +1081,7 @@ gtk_clist_set_pixtext (GtkCList * clist,
/* redraw the list if it's not frozen */ /* redraw the list if it's not frozen */
if (!GTK_CLIST_FROZEN (clist)) if (!GTK_CLIST_FROZEN (clist))
{ {
if (gtk_clist_row_is_visible (clist, row)) if (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE)
draw_row (clist, NULL, row, clist_row); draw_row (clist, NULL, row, clist_row);
} }
} }
@ -1144,7 +1144,8 @@ gtk_clist_set_foreground (GtkCList * clist,
else else
clist_row->fg_set = FALSE; clist_row->fg_set = FALSE;
if (!GTK_CLIST_FROZEN (clist) && gtk_clist_row_is_visible (clist, row)) if (!GTK_CLIST_FROZEN (clist)
&& (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE))
draw_row (clist, NULL, row, clist_row); draw_row (clist, NULL, row, clist_row);
} }
@ -1170,7 +1171,8 @@ gtk_clist_set_background (GtkCList * clist,
else else
clist_row->bg_set = FALSE; clist_row->bg_set = FALSE;
if (!GTK_CLIST_FROZEN (clist) && gtk_clist_row_is_visible (clist, row)) if (!GTK_CLIST_FROZEN (clist)
&& (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE))
draw_row (clist, NULL, row, clist_row); draw_row (clist, NULL, row, clist_row);
} }
@ -1195,7 +1197,8 @@ gtk_clist_set_shift (GtkCList * clist,
clist_row->cell[column].vertical = vertical; clist_row->cell[column].vertical = vertical;
clist_row->cell[column].horizontal = horizontal; clist_row->cell[column].horizontal = horizontal;
if (!GTK_CLIST_FROZEN (clist) && gtk_clist_row_is_visible (clist, row)) if (!GTK_CLIST_FROZEN (clist)
&& (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE))
draw_row (clist, NULL, row, clist_row); draw_row (clist, NULL, row, clist_row);
} }
@ -1244,7 +1247,7 @@ gtk_clist_append (GtkCList * clist,
{ {
adjust_scrollbars (clist); adjust_scrollbars (clist);
if (gtk_clist_row_is_visible (clist, clist->rows - 1)) if (gtk_clist_row_is_visible (clist, clist->rows - 1) != GTK_VISIBILITY_NONE)
draw_rows (clist, NULL); draw_rows (clist, NULL);
} }
@ -1298,7 +1301,7 @@ gtk_clist_insert (GtkCList * clist,
{ {
adjust_scrollbars (clist); adjust_scrollbars (clist);
if (gtk_clist_row_is_visible (clist, row)) if (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE)
draw_rows (clist, NULL); draw_rows (clist, NULL);
} }
} }
@ -1317,7 +1320,7 @@ gtk_clist_remove (GtkCList * clist,
if (row < 0 || row > (clist->rows - 1)) if (row < 0 || row > (clist->rows - 1))
return; return;
was_visible = gtk_clist_row_is_visible (clist, row); was_visible = (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE);
was_selected = 0; was_selected = 0;
/* get the row we're going to delete */ /* get the row we're going to delete */
@ -1564,25 +1567,33 @@ gtk_clist_unselect_row (GtkCList * clist,
unselect_row (clist, row, column, NULL); unselect_row (clist, row, column, NULL);
} }
gint GtkVisibility
gtk_clist_row_is_visible (GtkCList * clist, gtk_clist_row_is_visible (GtkCList * clist,
gint row) gint row)
{ {
gint top;
g_return_val_if_fail (clist != NULL, 0); g_return_val_if_fail (clist != NULL, 0);
if (row < 0 || row >= clist->rows) if (row < 0 || row >= clist->rows)
return 0; return GTK_VISIBILITY_NONE;
if (clist->row_height == 0) if (clist->row_height == 0)
return 0; return GTK_VISIBILITY_NONE;
if (row < ROW_FROM_YPIXEL (clist, 0)) if (row < ROW_FROM_YPIXEL (clist, 0))
return 0; return GTK_VISIBILITY_NONE;
if (row > ROW_FROM_YPIXEL (clist, clist->clist_window_height)) if (row > ROW_FROM_YPIXEL (clist, clist->clist_window_height))
return 0; return GTK_VISIBILITY_NONE;
return 1; top = ROW_TOP_YPIXEL (clist, row);
if ((top < 0)
|| ((top + clist->row_height) >= clist->clist_window_height))
return GTK_VISIBILITY_PARTIAL;
return GTK_VISIBILITY_FULL;
} }
GtkAdjustment * GtkAdjustment *
@ -3023,7 +3034,8 @@ real_select_row (GtkCList * clist,
clist_row->state = GTK_STATE_SELECTED; clist_row->state = GTK_STATE_SELECTED;
clist->selection = g_list_append (clist->selection, (gpointer) row); clist->selection = g_list_append (clist->selection, (gpointer) row);
if (!GTK_CLIST_FROZEN (clist) && gtk_clist_row_is_visible (clist, row)) if (!GTK_CLIST_FROZEN (clist)
&& (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE))
draw_row (clist, NULL, row, clist_row); draw_row (clist, NULL, row, clist_row);
} }
} }
@ -3048,7 +3060,8 @@ real_unselect_row (GtkCList * clist,
clist_row->state = GTK_STATE_NORMAL; clist_row->state = GTK_STATE_NORMAL;
clist->selection = g_list_remove (clist->selection, (gpointer) row); clist->selection = g_list_remove (clist->selection, (gpointer) row);
if (!GTK_CLIST_FROZEN (clist) && gtk_clist_row_is_visible (clist, row)) if (!GTK_CLIST_FROZEN (clist)
&& (gtk_clist_row_is_visible (clist, row) != GTK_VISIBILITY_NONE))
draw_row (clist, NULL, row, clist_row); draw_row (clist, NULL, row, clist_row);
} }
} }

4
gtk/gtkclist.h
View File

@ -352,8 +352,8 @@ void gtk_clist_moveto (GtkCList * clist,
gfloat row_align, gfloat row_align,
gfloat col_align); gfloat col_align);
/* returns true if the row is visible */ /* returns whether the row is visible */
gint gtk_clist_row_is_visible (GtkCList * clist, GtkVisibility gtk_clist_row_is_visible (GtkCList * clist,
gint row); gint row);
/* returns the cell type */ /* returns the cell type */

8
gtk/gtkenums.h
View File

@ -208,6 +208,14 @@ typedef enum
GTK_TOOLBAR_BOTH GTK_TOOLBAR_BOTH
} GtkToolbarStyle; } GtkToolbarStyle;
/* Generic visibility flags */
typedef enum
{
GTK_VISIBILITY_NONE,
GTK_VISIBILITY_PARTIAL,
GTK_VISIBILITY_FULL
} GtkVisibility;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */