AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

better drawing of GtkMenuItem add notes about GtkMenu remove leftover

Browse Source 
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""
This commit is contained in:
Soeren Sandmann 2003-07-06 15:33:56 +00:00 committed by Søren Sandmann Pedersen
parent c8515b2f8d
commit e9b612a8a1
7 changed files with 116 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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.

6
ChangeLog.pre-2-10
View File

@ -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.

6
ChangeLog.pre-2-4
View File

@ -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.

6
ChangeLog.pre-2-6
View File

@ -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.

6
ChangeLog.pre-2-8
View File

@ -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.

109
docs/widget_geometry.txt
View File

@ -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
+----------------------------------------------------------------------------+
| A |
| +------------------------------------------------------------------------+ |
| |############################# C ########################################| |
| |#+-+------------+--+-------------------------------+--+-------------+-+#| |
| |#| |\\\\\\\\\\\\| | /|\ |**| | |#| |
| |#| |<------E------>| | |**| G | |#| |
| |#| |\\\\\\\\\\\\| | | |**| | |#| |
| |#| |\\\\\\\\\\\\| | | |**| >> | |#| |
| |#| |\\\\\\\\\\\\| | | |**| >>>> | |#| |
| |#| |\\\\\\\\\\\\| | | |**| >>>>>> | |#| |
|A|B|D|\\\\\\\\\\\\| F| Child G |*H| >>>>>>>> |D|B|A|
| |#| |\\\\\\\\\\\\| | | |**| >>>>>> | |#| |
| |#| |\\\\\\\\\\\\| | | |**| >>>> | |#| |
| |#| |\\\\\\\\\\\\| | | |**| >> | |#| |
| |#| |\\\\\\\\\\\\| | | |**| | |#| |
| |#| |\\\\\\\\\\\\| | | |**| | |#| |
| |#| |\\\\\\\\\\\\| | \|/ |**| | |#| |
| |#+-+------------+--+-------------------------------+--+-------------+-+#| |
| |############################# C ########################################| |
| +------------------------------------------------------------------------+ |
| A |
+----------------------------------------------------------------------------+
B
------------------
A C D E G A
+----+----------+-----+----------------------+----+-----------+----+
| | | | ^ | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | icon | | child | G | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | v | | | |
+----+----------+-----+----------------------+----+-----------+----+
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)
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
=============

1
gtk/gtkstyle.c
View File

@ -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