diff options
Diffstat (limited to 'plugins/gtkui')
-rw-r--r-- | plugins/gtkui/gtkui.c | 4 | ||||
-rw-r--r-- | plugins/gtkui/gtkui_api.h | 9 | ||||
-rw-r--r-- | plugins/gtkui/widgets.c | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index 19abe3e3..4be83333 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -1720,9 +1720,9 @@ static ddb_gtkui_t plugin = { .gui.plugin.api_vmajor = 1, .gui.plugin.api_vminor = 4, .gui.plugin.version_major = 2, - .gui.plugin.version_minor = GTKUI_API_VERSION, + .gui.plugin.version_minor = DDB_GTKUI_API_VERSION, .gui.plugin.type = DB_PLUGIN_MISC, - .gui.plugin.id = GTKUI_PLUGIN_ID, + .gui.plugin.id = DDB_GTKUI_PLUGIN_ID, #if GTK_CHECK_VERSION(3,0,0) .gui.plugin.name = "GTK3 user interface", .gui.plugin.descr = "User interface using GTK+ 3.x", diff --git a/plugins/gtkui/gtkui_api.h b/plugins/gtkui/gtkui_api.h index 9f11ed9b..b6ac7f58 100644 --- a/plugins/gtkui/gtkui_api.h +++ b/plugins/gtkui/gtkui_api.h @@ -25,14 +25,17 @@ #ifndef __GTKUI_API_H #define __GTKUI_API_H -#define GTKUI_API_VERSION 0 +#define DDB_GTKUI_API_VERSION 0 #if GTK_CHECK_VERSION(3,0,0) -#define GTKUI_PLUGIN_ID "gtkui3_1" +#define DDB_GTKUI_PLUGIN_ID "gtkui3_1" #else -#define GTKUI_PLUGIN_ID "gtkui_1" +#define DDB_GTKUI_PLUGIN_ID "gtkui_1" #endif +// this flag tells that the widget should be added to h/vboxes with expand=FALSE +#define DDB_GTKUI_WIDGET_FLAG_NON_EXPANDABLE 0x00000001 + typedef struct ddb_gtkui_widget_s { const char *type; char *name; diff --git a/plugins/gtkui/widgets.c b/plugins/gtkui/widgets.c index 6d74125c..22ddab88 100644 --- a/plugins/gtkui/widgets.c +++ b/plugins/gtkui/widgets.c @@ -737,6 +737,7 @@ w_placeholder_create (void) { w->base.widget = gtk_event_box_new (); w->drawarea = gtk_drawing_area_new (); + gtk_widget_set_size_request (w->drawarea, 20, 20); gtk_widget_show (w->drawarea); gtk_container_add (GTK_CONTAINER (w->base.widget), w->drawarea); @@ -1325,6 +1326,7 @@ ddb_gtkui_widget_t * w_tabstrip_create (void) { w_tabstrip_t *w = malloc (sizeof (w_tabstrip_t)); memset (w, 0, sizeof (w_tabstrip_t)); + w->base.flags = DDB_GTKUI_WIDGET_FLAG_NON_EXPANDABLE; w->base.widget = gtk_event_box_new (); GtkWidget *ts = ddb_tabstrip_new (); gtk_widget_show (ts); @@ -2344,7 +2346,7 @@ w_spectrum_create (void) { static void w_hvbox_append (struct ddb_gtkui_widget_s *container, struct ddb_gtkui_widget_s *child) { w_hvbox_t *b = (w_hvbox_t *)container; - gtk_box_pack_start (GTK_BOX (b->box), child->widget, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (b->box), child->widget, (child->flags & DDB_GTKUI_WIDGET_FLAG_NON_EXPANDABLE) ? FALSE : TRUE, TRUE, 0); gtk_widget_show (child->widget); } |