diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | docs/widget_geometry.txt | 113 | ||||
| -rw-r--r-- | gtk/gtkstyle.c | 1 |
7 files changed, 118 insertions, 26 deletions
@@ -1,3 +1,9 @@ +Sun Jul 6 17:21:23 2003 Soeren Sandmann <sandmann@daimi.au.dk> + + * docs/widget_geometry.txt: better drawing of GtkMenuItem + * docs/widget_geometry.txt: add notes about GtkMenu + * gtk/gtkstyle.c: remove leftover "#include "gtkhandlebox.h"" + Sat Jul 5 10:34:00 2003 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtkmenu.c: add vertical_padding style property. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a5d59c5ff6..f7d3cae3dd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sun Jul 6 17:21:23 2003 Soeren Sandmann <sandmann@daimi.au.dk> + + * docs/widget_geometry.txt: better drawing of GtkMenuItem + * docs/widget_geometry.txt: add notes about GtkMenu + * gtk/gtkstyle.c: remove leftover "#include "gtkhandlebox.h"" + Sat Jul 5 10:34:00 2003 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtkmenu.c: add vertical_padding style property. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a5d59c5ff6..f7d3cae3dd 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sun Jul 6 17:21:23 2003 Soeren Sandmann <sandmann@daimi.au.dk> + + * docs/widget_geometry.txt: better drawing of GtkMenuItem + * docs/widget_geometry.txt: add notes about GtkMenu + * gtk/gtkstyle.c: remove leftover "#include "gtkhandlebox.h"" + Sat Jul 5 10:34:00 2003 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtkmenu.c: add vertical_padding style property. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a5d59c5ff6..f7d3cae3dd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sun Jul 6 17:21:23 2003 Soeren Sandmann <sandmann@daimi.au.dk> + + * docs/widget_geometry.txt: better drawing of GtkMenuItem + * docs/widget_geometry.txt: add notes about GtkMenu + * gtk/gtkstyle.c: remove leftover "#include "gtkhandlebox.h"" + Sat Jul 5 10:34:00 2003 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtkmenu.c: add vertical_padding style property. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a5d59c5ff6..f7d3cae3dd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sun Jul 6 17:21:23 2003 Soeren Sandmann <sandmann@daimi.au.dk> + + * docs/widget_geometry.txt: better drawing of GtkMenuItem + * docs/widget_geometry.txt: add notes about GtkMenu + * gtk/gtkstyle.c: remove leftover "#include "gtkhandlebox.h"" + Sat Jul 5 10:34:00 2003 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtkmenu.c: add vertical_padding style property. diff --git a/docs/widget_geometry.txt b/docs/widget_geometry.txt index 882ecbb944..dbb2de84d7 100644 --- a/docs/widget_geometry.txt +++ b/docs/widget_geometry.txt @@ -2,35 +2,98 @@ This file is some notes about how different widgets are drawn. ============= +GtkMenu + +============= ++----------------------------------------------------------------------------+ +| A | +| +------------------------------------------------------------------------+ | +| |############################# C ########################################| | +| |# D #| | +| |# +-------------------------------------------------------------------+#| | +| |# | |#| | +| |# | |#| | +| |# | |#| | +| |# | Item 1 |#| | +| |# | |#| | +| |# | |#| | +| |# | |#| | +| |# | |#| | +| |# | |#| | +| |# +-------------------------------------------------------------------+#| | +| |# +-------------------------------------------------------------------+#| | +| |# | |#| | +| |# | |#| | +|A|B | |B|A| +| |# | Item 2 |#| | +| |# | |#| | +| |# | |#| | +| |# | |#| | +| |# | |#| | +| |# | |#| | +| |# +-------------------------------------------------------------------+#| | +| |# [...] #| | +| |# +-------------------------------------------------------------------+#| | +| |# | |#| | +| |# | |#| | +| |# | |#| | +| |# | Item n |#| | +| |# | |#| | +| |# | |#| | +| |# | |#| | +| |# | |#| | +| |# | |#| | +| |# +-------------------------------------------------------------------+#| | +| |# D #| | +| |############################# C ########################################| | +| +------------------------------------------------------------------------| | +| A | ++----------------------------------------------------------------------------+ + +A: GtkContainer::border_width +B: xthickness +C: ythickness +D: vertical_padding + +============= + GtkMenuItem ============= -arrowspacing -togglespacing -horizontal_padding - - B - ------------------ - A C D E G A -+----+----------+-----+----------------------+----+-----------+----+ -| | | | ^ | | | | -| | | | | | | | | -| | | | | | | | | -| | | | | | | | | -| | icon | | child | G | | | | -| | | | | | | | | -| | | | | | | | | -| | | | | | | | | -| | | | v | | | | -+----+----------+-----+----------------------+----+-----------+----+ - -A: horizontal_padding -B: width of icon or indicator + toggle_spacing -C: toggle_spacing -D: child's requested size -E: arrow spacing (if the item has a submenu -G: child's requested height (also used for width of arrow field ++----------------------------------------------------------------------------+ +| A | +| +------------------------------------------------------------------------+ | +| |############################# C ########################################| | +| |#+-+------------+--+-------------------------------+--+-------------+-+#| | +| |#| |\\\\\\\\\\\\| | /|\ |**| | |#| | +| |#| |<------E------>| | |**| G | |#| | +| |#| |\\\\\\\\\\\\| | | |**| | |#| | +| |#| |\\\\\\\\\\\\| | | |**| >> | |#| | +| |#| |\\\\\\\\\\\\| | | |**| >>>> | |#| | +| |#| |\\\\\\\\\\\\| | | |**| >>>>>> | |#| | +|A|B|D|\\\\\\\\\\\\| F| Child G |*H| >>>>>>>> |D|B|A| +| |#| |\\\\\\\\\\\\| | | |**| >>>>>> | |#| | +| |#| |\\\\\\\\\\\\| | | |**| >>>> | |#| | +| |#| |\\\\\\\\\\\\| | | |**| >> | |#| | +| |#| |\\\\\\\\\\\\| | | |**| | |#| | +| |#| |\\\\\\\\\\\\| | | |**| | |#| | +| |#| |\\\\\\\\\\\\| | \|/ |**| | |#| | +| |#+-+------------+--+-------------------------------+--+-------------+-+#| | +| |############################# C ########################################| | +| +------------------------------------------------------------------------+ | +| A | ++----------------------------------------------------------------------------+ + +A: GtkContainer:border_width +B: xthickness +C: ythickness +D: horizontal_padding +E: toggle_size +F: toggle_spacing +G: Requested height of child (also used for width of arrow +H: arrow_spacing spacing (when the item has a non-vertical submenu) + ============= diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 674069c676..44596561b0 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -35,7 +35,6 @@ #include "gtkthemes.h" #include "gtkiconfactory.h" #include "gtksettings.h" /* _gtk_settings_parse_convert() */ -#include "gtkhandlebox.h" #define LIGHTNESS_MULT 1.3 #define DARKNESS_MULT 0.7 |