gtkui: fixed naming of some public constants; added non-expandable widget flag support

6 files changed, 14 insertions, 9 deletions

diff --git a/plugins/converter/convgui.c b/plugins/converter/convgui.c
index 8680f9c4..70cfb2f2 100644
--- a/plugins/converter/convgui.c
+++ b/plugins/converter/convgui.c
@@ -1446,7 +1446,7 @@ convgui_get_actions (DB_playItem_t *it)
 
 int
 convgui_connect (void) {
-    gtkui_plugin = (ddb_gtkui_t *)deadbeef->plug_get_for_id (GTKUI_PLUGIN_ID);
+    gtkui_plugin = (ddb_gtkui_t *)deadbeef->plug_get_for_id (DDB_GTKUI_PLUGIN_ID);
     converter_plugin = (ddb_converter_t *)deadbeef->plug_get_for_id ("converter");
     if (!gtkui_plugin) {
         fprintf (stderr, "convgui: gtkui plugin not found\n");
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);
 }
 
diff --git a/plugins/pltbrowser/pltbrowser.c b/plugins/pltbrowser/pltbrowser.c
index afe86901..c1e168d0 100644
--- a/plugins/pltbrowser/pltbrowser.c
+++ b/plugins/pltbrowser/pltbrowser.c
@@ -167,7 +167,7 @@ w_pltbrowser_create (void) {
 
 static int
 pltbrowser_connect (void) {
-    gtkui_plugin = (ddb_gtkui_t *)deadbeef->plug_get_for_id (GTKUI_PLUGIN_ID);
+    gtkui_plugin = (ddb_gtkui_t *)deadbeef->plug_get_for_id (DDB_GTKUI_PLUGIN_ID);
     if(!gtkui_plugin) {
         fprintf (stderr, "pltbrowser: can't find gtkui plugin\n");
         return -1;
diff --git a/plugins/shellexecui/shellexecui.c b/plugins/shellexecui/shellexecui.c
index a473f67b..ffe64b3a 100644
--- a/plugins/shellexecui/shellexecui.c
+++ b/plugins/shellexecui/shellexecui.c
@@ -375,7 +375,7 @@ shxui_getactions(DB_playItem_t *it) {
 }
 
 int shxui_connect() {
-    gtkui_plugin = (ddb_gtkui_t *)deadbeef->plug_get_for_id (GTKUI_PLUGIN_ID);
+    gtkui_plugin = (ddb_gtkui_t *)deadbeef->plug_get_for_id (DDB_GTKUI_PLUGIN_ID);
     if (!gtkui_plugin) {
         fprintf (stderr, "shellexecui: can't find gtkui plugin\n");
         return -1;