use standard GtkHPaned for sidebar width

diff --git a/src/bar.c b/src/bar.c
index 4b32534..18ff287 100644 (file)
--- a/src/bar.c
+++ b/src/bar.c
@@ -30,8 +30,8 @@
 #include "histogram.h"
 #include "rcfile.h"
 
-#define BAR_SIZE_INCREMENT 48
-#define BAR_ARROW_SIZE 7
+//#define BAR_SIZE_INCREMENT 48
+//#define BAR_ARROW_SIZE 7
 
 
 typedef struct _BarData BarData;
@@ -223,10 +223,6 @@ void bar_set_selection_func(GtkWidget *bar, GList *(*list_func)(gpointer data),
        return;
 }
 
-
-
-
-
 void bar_add(GtkWidget *bar, GtkWidget *pane)
 {
        GtkWidget *expander;
@@ -278,35 +274,18 @@ static void bar_populate_default(GtkWidget *bar)
        bar_add(bar, widget);
 }
 
-static void bar_sized(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
+static void bar_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
 {
        BarData *bd = data;
+       
        bd->width = allocation->width;
 }
 
-
-static void bar_width(BarData *bd, gint val)
-{
-       gint size;
-
-       size = bd->widget->allocation.width;
-       size = CLAMP(size + val, BAR_SIZE_INCREMENT * 2, BAR_SIZE_INCREMENT * 16);
-
-       gtk_widget_set_size_request(bd->widget, size, -1);
-}
-
-static void bar_larger(GtkWidget *widget, gpointer data)
+gint bar_get_width(GtkWidget *bar)
 {
-       BarData *bd = data;
-
-       bar_width(bd, BAR_SIZE_INCREMENT);
-}
-
-static void bar_smaller(GtkWidget *widget, gpointer data)
-{
-       BarData *bd = data;
-
-       bar_width(bd, -BAR_SIZE_INCREMENT);
+       BarData *bd = g_object_get_data(G_OBJECT(bar), "bar_data");
+       if (!bd) return 0;
+       return bd->width;
 }
 
 void bar_close(GtkWidget *bar)
@@ -343,19 +322,14 @@ GtkWidget *bar_new(GtkWidget *bounding_widget)
        g_signal_connect(G_OBJECT(bd->widget), "destroy",
                         G_CALLBACK(bar_destroy), bd);
 
-       g_signal_connect(G_OBJECT(bd->widget), "size_allocate",
-                        G_CALLBACK(bar_sized), bd);
+       g_signal_connect(G_OBJECT(bd->widget), "size-allocate",
+                        G_CALLBACK(bar_size_allocate), bd);
 
-       bd->width = PANEL_DEFAULT_WIDTH;
+       bd->width = SIDEBAR_DEFAULT_WIDTH;
        gtk_widget_set_size_request(bd->widget, bd->width, -1);
 
        box = gtk_hbox_new(FALSE, 0);
 
-       sizer = sizer_new(bd->widget, bounding_widget, SIZER_POS_LEFT);
-       sizer_set_limits(sizer, BAR_SIZE_INCREMENT * 2, -1, -1 , -1);
-       gtk_box_pack_start(GTK_BOX(box), sizer, FALSE, FALSE, 0);
-       gtk_widget_show(sizer);
-
        bd->label_file_name = gtk_label_new("");
        gtk_label_set_ellipsize(GTK_LABEL(bd->label_file_name), PANGO_ELLIPSIZE_END);
        gtk_label_set_selectable(GTK_LABEL(bd->label_file_name), TRUE);
@@ -363,28 +337,6 @@ GtkWidget *bar_new(GtkWidget *bounding_widget)
        gtk_box_pack_start(GTK_BOX(box), bd->label_file_name, TRUE, TRUE, 0);
        gtk_widget_show(bd->label_file_name);
 
-       button = gtk_button_new();
-       gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-       g_signal_connect(G_OBJECT(button), "clicked",
-                        G_CALLBACK(bar_smaller), bd);
-       gtk_box_pack_end(GTK_BOX(box), button, FALSE, FALSE, 0);
-       arrow = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
-       gtk_widget_set_size_request(arrow, BAR_ARROW_SIZE, BAR_ARROW_SIZE);
-       gtk_container_add(GTK_CONTAINER(button), arrow);
-       gtk_widget_show(arrow);
-       gtk_widget_show(button);
-
-       button = gtk_button_new();
-       gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-       g_signal_connect(G_OBJECT(button), "clicked",
-                        G_CALLBACK(bar_larger), bd);
-       gtk_box_pack_end(GTK_BOX(box), button, FALSE, FALSE, 0);
-       arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
-       gtk_widget_set_size_request(arrow, BAR_ARROW_SIZE, BAR_ARROW_SIZE);
-       gtk_container_add(GTK_CONTAINER(button), arrow);
-       gtk_widget_show(arrow);
-       gtk_widget_show(button);
-
        gtk_box_pack_start(GTK_BOX(bd->widget), box, FALSE, FALSE, 0);
        gtk_widget_show(box);
 
@@ -420,7 +372,7 @@ GtkWidget *bar_new_from_config(GtkWidget *bounding_widget, const gchar **attribu
        GtkWidget *bar = bar_new(bounding_widget);
        
        gboolean enabled = TRUE;
-       gint width = PANEL_DEFAULT_WIDTH;
+       gint width = SIDEBAR_DEFAULT_WIDTH;
 
        while (*attribute_names)
                {

diff --git a/src/bar.h b/src/bar.h
index fb7c3e9..eb695df 100644 (file)
--- a/src/bar.h
+++ b/src/bar.h
@@ -45,6 +45,7 @@ void bar_set_fd(GtkWidget *bar, FileData *fd);
 gint bar_event(GtkWidget *bar, GdkEvent *event);
 
 void bar_set_selection_func(GtkWidget *bar, GList *(*list_func)(gpointer data), gpointer data); 
+gint bar_get_width(GtkWidget *bar);
 
 /* following functions are common for all panes */
 void bar_pane_set_selection_func(GtkWidget *pane, GList *(*list_func)(gpointer data), gpointer data); 

diff --git a/src/layout.c b/src/layout.c
index 7ea5155..97a4bf8 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -1562,16 +1562,17 @@ void layout_split_change(LayoutWindow *lw, ImageSplitMode mode)
                if (lw->split_images[i])
                        {
                        gtk_widget_hide(lw->split_images[i]->widget);
-                       if (lw->split_images[i]->widget->parent != lw->utility_box)
+                       if (lw->split_images[i]->widget->parent != lw->utility_paned)
                                gtk_container_remove(GTK_CONTAINER(lw->split_images[i]->widget->parent), lw->split_images[i]->widget);
                        }
                }
-       gtk_container_remove(GTK_CONTAINER(lw->utility_box), lw->split_image_widget);
+       gtk_container_remove(GTK_CONTAINER(lw->utility_paned), lw->split_image_widget);
 
        image = layout_image_setup_split(lw, mode);
 
-       gtk_box_pack_start(GTK_BOX(lw->utility_box), image, TRUE, TRUE, 0);
-       gtk_box_reorder_child(GTK_BOX(lw->utility_box), image, 0);
+//     gtk_box_pack_start(GTK_BOX(lw->utility_box), image, TRUE, TRUE, 0);
+//     gtk_box_reorder_child(GTK_BOX(lw->utility_box), image, 0);
+       gtk_paned_pack1(GTK_PANED(lw->utility_paned), image, TRUE, FALSE);
        gtk_widget_show(image);
 }
 

diff --git a/src/layout_image.c b/src/layout_image.c
index e27fad7..bf8335c 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -1579,6 +1579,8 @@ GtkWidget *layout_image_new(LayoutWindow *lw, gint i)
                image_color_profile_set_use(lw->split_images[i], options->color_profile.enabled);
 
                gtk_size_group_add_widget(lw->split_image_sizegroup, lw->split_images[i]->widget);
+               gtk_widget_set_size_request(lw->split_images[i]->widget, IMAGE_MIN_WIDTH, -1);
+
                }
 
        return lw->split_images[i]->widget;

diff --git a/src/layout_util.c b/src/layout_util.c
index 6eee3ad..a5e3a61 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -1996,7 +1996,8 @@ void layout_bar_set(LayoutWindow *lw, GtkWidget *bar)
                         G_CALLBACK(layout_bar_destroyed), lw);
 
 
-       gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->bar, FALSE, FALSE, 0);
+//     gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->bar, FALSE, FALSE, 0);
+       gtk_paned_pack2(GTK_PANED(lw->utility_paned), lw->bar, FALSE, TRUE); 
 
        bar_set_fd(lw->bar, layout_image_get_fd(lw));
 }
@@ -2124,7 +2125,12 @@ void layout_bars_new_selection(LayoutWindow *lw, gint count)
 GtkWidget *layout_bars_prepare(LayoutWindow *lw, GtkWidget *image)
 {
        lw->utility_box = gtk_hbox_new(FALSE, PREF_PAD_GAP);
-       gtk_box_pack_start(GTK_BOX(lw->utility_box), image, TRUE, TRUE, 0);
+       lw->utility_paned = gtk_hpaned_new();
+       gtk_box_pack_start(GTK_BOX(lw->utility_box), lw->utility_paned, TRUE, TRUE, 0);
+
+       gtk_paned_pack1(GTK_PANED(lw->utility_paned), image, TRUE, FALSE); 
+       gtk_widget_show(lw->utility_paned);
+       
        gtk_widget_show(image);
 
        return lw->utility_box;

diff --git a/src/main.h b/src/main.h
index 0ff57ea..5b850dc 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -106,9 +106,9 @@
 #define IMAGE_LOADER_IDLE_READ_LOOP_COUNT_MIN          1
 #define IMAGE_LOADER_IDLE_READ_LOOP_COUNT_MAX          16
 
-#define PANEL_MIN_WIDTH        64
-#define PANEL_DEFAULT_WIDTH 288
-#define PANEL_MAX_WIDTH 1200
+#define IMAGE_MIN_WIDTH 100
+#define SIDEBAR_DEFAULT_WIDTH 250
+
 
 #define DEFAULT_OVERLAY_INFO   "%collection:<i>*</i>\\n%" \
                                "(%number%/%total%) [%zoom%] <b>%name%</b>\n" \

diff --git a/src/typedefs.h b/src/typedefs.h
index bc05f85..a4410a3 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -645,6 +645,7 @@ struct _LayoutWindow
        /* misc */
 
        GtkWidget *utility_box;
+       GtkWidget *utility_paned; /* between image and bar */
        GtkWidget *bar_sort;
        GtkWidget *bar;