diff options
author | Jens Bache-Wiig <jbache@trolltech.com> | 2010-01-08 10:44:59 (GMT) |
---|---|---|
committer | Jens Bache-Wiig <jbache@trolltech.com> | 2010-01-08 10:50:48 (GMT) |
commit | 73629458a18ce577e0a46e61335ef92d18dac7be (patch) | |
tree | 3b62d9cc5ed8afd579a777a8343717b427e297e1 /src/gui/styles/qgtkstyle_p.h | |
parent | 7e5861de8019b7d383e2b2ad8cc3c46f1c3ef0bd (diff) | |
download | Qt-73629458a18ce577e0a46e61335ef92d18dac7be.zip Qt-73629458a18ce577e0a46e61335ef92d18dac7be.tar.gz Qt-73629458a18ce577e0a46e61335ef92d18dac7be.tar.bz2 |
Fixes: MenuItem size fixes and missing separator with Gtk+
Task: QTBUG-6522
RevBy: thorbjorn
Details:
This fixes missing separator line in the Dust theme.
The patch also significantly improves the accuracy of menu item
size metrics by making use of gtk_widget_size_request to query
things like default heights.
- More accurate offset and size of separators
- Fixed item height of menu items using size_request
- Fixed vertical offset of label and check boxes
- Fixed clipping issue on last menu item
Diffstat (limited to 'src/gui/styles/qgtkstyle_p.h')
-rw-r--r-- | src/gui/styles/qgtkstyle_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/styles/qgtkstyle_p.h b/src/gui/styles/qgtkstyle_p.h index ad672db..db5b9b9 100644 --- a/src/gui/styles/qgtkstyle_p.h +++ b/src/gui/styles/qgtkstyle_p.h @@ -147,8 +147,10 @@ typedef void (*Ptr_gtk_paint_vline) (GtkStyle *, GdkWindow *, GtkStateType, co typedef void (*Ptr_gtk_menu_item_set_submenu) (GtkMenuItem *, GtkWidget *); typedef void (*Ptr_gtk_container_forall) (GtkContainer *, GtkCallback, gpointer); typedef void (*Ptr_gtk_widget_size_allocate) (GtkWidget *, GtkAllocation*); +typedef void (*Ptr_gtk_widget_size_request) (GtkWidget *widget, GtkRequisition *requisition); typedef void (*Ptr_gtk_widget_set_direction) (GtkWidget *, GtkTextDirection); typedef void (*Ptr_gtk_widget_path) (GtkWidget *, guint *, gchar **, gchar**); + typedef void (*Ptr_gtk_toolbar_insert) (GtkToolbar *toolbar, GtkToolItem *item, int pos); typedef void (*Ptr_gtk_menu_shell_append)(GtkMenuShell *, GtkWidget *); typedef GtkType (*Ptr_gtk_container_get_type) (void); @@ -365,6 +367,7 @@ public: static Ptr_gtk_settings_get_default gtk_settings_get_default; static Ptr_gtk_separator_menu_item_new gtk_separator_menu_item_new; static Ptr_gtk_widget_size_allocate gtk_widget_size_allocate; + static Ptr_gtk_widget_size_request gtk_widget_size_request; static Ptr_gtk_widget_set_direction gtk_widget_set_direction; static Ptr_gtk_widget_path gtk_widget_path; static Ptr_gtk_container_get_type gtk_container_get_type; |