|
|
4ec6dda |
--- a/src/nemo-pathbar.c
|
|
|
4ec6dda |
+++ b/src/nemo-pathbar.c
|
|
|
4ec6dda |
@@ -491,7 +491,11 @@ nemo_path_bar_get_preferred_width (GtkWidget *widget,
|
|
|
4ec6dda |
*minimum = MAX (*minimum, child_min);
|
|
|
4ec6dda |
*natural = MAX (*natural, child_nat);
|
|
|
4ec6dda |
}
|
|
|
4ec6dda |
- path_bar->priv->slider_width = MIN (height * 2 / 3 + 5, height);
|
|
|
4ec6dda |
+
|
|
|
4ec6dda |
+ gtk_widget_get_preferred_width (path_bar->priv->down_slider_button,
|
|
|
4ec6dda |
+ &path_bar->priv->slider_width,
|
|
|
4ec6dda |
+ NULL);
|
|
|
4ec6dda |
+
|
|
|
4ec6dda |
*minimum += path_bar->priv->slider_width * 2;
|
|
|
4ec6dda |
*natural += path_bar->priv->slider_width * 2;
|
|
|
4ec6dda |
}
|
|
|
4ec6dda |
@@ -618,6 +618,10 @@ nemo_path_bar_size_allocate (GtkWidget *widget,
|
|
|
4ec6dda |
}
|
|
|
4ec6dda |
direction = gtk_widget_get_direction (widget);
|
|
|
4ec6dda |
|
|
|
4ec6dda |
+ gtk_widget_get_preferred_width (path_bar->priv->up_slider_button,
|
|
|
4ec6dda |
+ &path_bar->priv->slider_width,
|
|
|
4ec6dda |
+ NULL);
|
|
|
4ec6dda |
+
|
|
|
4ec6dda |
gtk_widget_get_preferred_size (BUTTON_DATA (path_bar->priv->button_list->data)->button,
|
|
|
4ec6dda |
NULL, &child_requisition);
|
|
|
4ec6dda |
width = child_requisition.width;
|
|
|
4ec6dda |
--- a/src/nemo-window.c
|
|
|
4ec6dda |
+++ b/src/nemo-window.c
|
|
|
4ec6dda |
@@ -1030,45 +1030,6 @@ nemo_window_set_active_slot (NemoWindow *window, NemoWindowSlot *new_slot)
|
|
|
4ec6dda |
}
|
|
|
4ec6dda |
|
|
|
4ec6dda |
static void
|
|
|
4ec6dda |
-nemo_window_get_preferred_width (GtkWidget *widget,
|
|
|
4ec6dda |
- gint *minimal_width,
|
|
|
4ec6dda |
- gint *natural_width)
|
|
|
4ec6dda |
-{
|
|
|
4ec6dda |
- GdkScreen *screen;
|
|
|
4ec6dda |
- gint max_w, min_w, default_w;
|
|
|
4ec6dda |
-
|
|
|
4ec6dda |
- screen = gtk_window_get_screen (GTK_WINDOW (widget));
|
|
|
4ec6dda |
-
|
|
|
4ec6dda |
- max_w = get_max_forced_width (screen);
|
|
|
4ec6dda |
- min_w = NEMO_WINDOW_MIN_WIDTH;
|
|
|
4ec6dda |
-
|
|
|
4ec6dda |
- default_w = NEMO_WINDOW_DEFAULT_WIDTH;
|
|
|
4ec6dda |
-
|
|
|
4ec6dda |
- *minimal_width = MIN (min_w, max_w);
|
|
|
4ec6dda |
- *natural_width = MIN (default_w, max_w);
|
|
|
4ec6dda |
-}
|
|
|
4ec6dda |
-
|
|
|
4ec6dda |
-static void
|
|
|
4ec6dda |
-nemo_window_get_preferred_height (GtkWidget *widget,
|
|
|
4ec6dda |
- gint *minimal_height,
|
|
|
4ec6dda |
- gint *natural_height)
|
|
|
4ec6dda |
-{
|
|
|
4ec6dda |
- GdkScreen *screen;
|
|
|
4ec6dda |
- gint max_h, min_h, default_h;
|
|
|
4ec6dda |
-
|
|
|
4ec6dda |
- screen = gtk_window_get_screen (GTK_WINDOW (widget));
|
|
|
4ec6dda |
-
|
|
|
4ec6dda |
- max_h = get_max_forced_height (screen);
|
|
|
4ec6dda |
-
|
|
|
4ec6dda |
- min_h = NEMO_WINDOW_MIN_HEIGHT;
|
|
|
4ec6dda |
-
|
|
|
4ec6dda |
- default_h = NEMO_WINDOW_DEFAULT_HEIGHT;
|
|
|
4ec6dda |
-
|
|
|
4ec6dda |
- *minimal_height = MIN (min_h, max_h);
|
|
|
4ec6dda |
- *natural_height = MIN (default_h, max_h);
|
|
|
4ec6dda |
-}
|
|
|
4ec6dda |
-
|
|
|
4ec6dda |
-static void
|
|
|
4ec6dda |
nemo_window_realize (GtkWidget *widget)
|
|
|
4ec6dda |
{
|
|
|
4ec6dda |
GTK_WIDGET_CLASS (nemo_window_parent_class)->realize (widget);
|
|
|
4ec6dda |
@@ -2138,8 +2099,6 @@ nemo_window_class_init (NemoWindowClass *class)
|
|
|
4ec6dda |
|
|
|
4ec6dda |
wclass->destroy = nemo_window_destroy;
|
|
|
4ec6dda |
wclass->show = nemo_window_show;
|
|
|
4ec6dda |
- wclass->get_preferred_width = nemo_window_get_preferred_width;
|
|
|
4ec6dda |
- wclass->get_preferred_height = nemo_window_get_preferred_height;
|
|
|
4ec6dda |
wclass->realize = nemo_window_realize;
|
|
|
4ec6dda |
wclass->key_press_event = nemo_window_key_press_event;
|
|
|
4ec6dda |
wclass->key_release_event = nemo_window_key_release_event;
|
|
|
4ec6dda |
|