summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wimpress <[email protected]>2015-06-12 21:38:08 +0100
committerMartin Wimpress <[email protected]>2015-06-12 21:38:08 +0100
commit0ebbecec4796084650addb344c1e1a000c7561d8 (patch)
tree32dbccfdba074ace7d880ab8b3fde4709add9075
parent41b8e5c1e21b02f7ebd0f7f61f9225be5e6f07f5 (diff)
parent14ddcdad31e8d405b1693095f77151b465f433e6 (diff)
downloadeom-0ebbecec4796084650addb344c1e1a000c7561d8.tar.bz2
eom-0ebbecec4796084650addb344c1e1a000c7561d8.tar.xz
Merge pull request #73 from NiceandGently/master
GTK3: reduce size of the statusbar
-rw-r--r--plugins/statusbar-date/eom-statusbar-date-plugin.c3
-rw-r--r--src/eom-statusbar.c38
-rw-r--r--src/eom-statusbar.h5
-rw-r--r--src/eom-window.c29
4 files changed, 12 insertions, 63 deletions
diff --git a/plugins/statusbar-date/eom-statusbar-date-plugin.c b/plugins/statusbar-date/eom-statusbar-date-plugin.c
index 427c218..9e405b4 100644
--- a/plugins/statusbar-date/eom-statusbar-date-plugin.c
+++ b/plugins/statusbar-date/eom-statusbar-date-plugin.c
@@ -124,9 +124,6 @@ static void impl_activate(EomPlugin* plugin, EomWindow* window)
data = g_new(WindowData, 1);
data->statusbar_date = gtk_statusbar_new();
-#if !GTK_CHECK_VERSION (3, 0, 0)
- gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(data->statusbar_date), FALSE);
-#endif
gtk_widget_set_size_request(data->statusbar_date, 200, 10);
gtk_box_pack_end(GTK_BOX(statusbar), data->statusbar_date, FALSE, FALSE, 0);
diff --git a/src/eom-statusbar.c b/src/eom-statusbar.c
index b4d6f08..e825e97 100644
--- a/src/eom-statusbar.c
+++ b/src/eom-statusbar.c
@@ -38,7 +38,7 @@ G_DEFINE_TYPE (EomStatusbar, eom_statusbar, GTK_TYPE_STATUSBAR)
struct _EomStatusbarPrivate
{
GtkWidget *progressbar;
- GtkWidget *img_num_statusbar;
+ GtkWidget *img_num_label;
};
static void
@@ -58,19 +58,17 @@ eom_statusbar_init (EomStatusbar *statusbar)
statusbar->priv = EOM_STATUSBAR_GET_PRIVATE (statusbar);
priv = statusbar->priv;
- #if !GTK_CHECK_VERSION(3, 0, 0)
- gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (statusbar), TRUE);
- #endif
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_set_margin_top (GTK_WIDGET (statusbar), 0);
+ gtk_widget_set_margin_bottom (GTK_WIDGET (statusbar), 0);
+#endif
- priv->img_num_statusbar = gtk_statusbar_new ();
- #if !GTK_CHECK_VERSION(3, 0, 0)
- gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (priv->img_num_statusbar), FALSE);
- #endif
- gtk_widget_set_size_request (priv->img_num_statusbar, 100, 10);
- gtk_widget_show (priv->img_num_statusbar);
+ priv->img_num_label = gtk_label_new (NULL);
+ gtk_widget_set_size_request (priv->img_num_label, 100, 10);
+ gtk_widget_show (priv->img_num_label);
gtk_box_pack_end (GTK_BOX (statusbar),
- priv->img_num_statusbar,
+ priv->img_num_label,
FALSE,
TRUE,
0);
@@ -114,8 +112,6 @@ eom_statusbar_set_image_number (EomStatusbar *statusbar,
g_return_if_fail (EOM_IS_STATUSBAR (statusbar));
- gtk_statusbar_pop (GTK_STATUSBAR (statusbar->priv->img_num_statusbar), 0);
-
/* Hide number display if values don't make sense */
if (G_UNLIKELY (num <= 0 || tot <= 0))
return;
@@ -132,7 +128,7 @@ eom_statusbar_set_image_number (EomStatusbar *statusbar,
* too.*/
msg = g_strdup_printf (_("%d / %d"), num, tot);
- gtk_statusbar_push (GTK_STATUSBAR (statusbar->priv->img_num_statusbar), 0, msg);
+ gtk_label_set_text (GTK_LABEL (statusbar->priv->img_num_label), msg);
g_free (msg);
}
@@ -148,20 +144,10 @@ eom_statusbar_set_progress (EomStatusbar *statusbar,
if (progress > 0 && progress < 1) {
gtk_widget_show (statusbar->priv->progressbar);
- gtk_widget_hide (statusbar->priv->img_num_statusbar);
+ gtk_widget_hide (statusbar->priv->img_num_label);
} else {
gtk_widget_hide (statusbar->priv->progressbar);
- gtk_widget_show (statusbar->priv->img_num_statusbar);
+ gtk_widget_show (statusbar->priv->img_num_label);
}
}
-#if !GTK_CHECK_VERSION(3, 0, 0)
-void
-eom_statusbar_set_has_resize_grip (EomStatusbar *statusbar, gboolean has_resize_grip)
-{
- g_return_if_fail (EOM_IS_STATUSBAR (statusbar));
-
- gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (statusbar),
- has_resize_grip);
-}
-#endif
diff --git a/src/eom-statusbar.h b/src/eom-statusbar.h
index cf263d4..4ecedec 100644
--- a/src/eom-statusbar.h
+++ b/src/eom-statusbar.h
@@ -63,11 +63,6 @@ void eom_statusbar_set_image_number (EomStatusbar *statusbar,
void eom_statusbar_set_progress (EomStatusbar *statusbar,
gdouble progress);
-#if !GTK_CHECK_VERSION(3, 0, 0)
-void eom_statusbar_set_has_resize_grip (EomStatusbar *statusbar,
- gboolean has_resize_grip);
-#endif
-
G_END_DECLS
#endif /* __EOM_STATUSBAR_H__ */
diff --git a/src/eom-window.c b/src/eom-window.c
index ef8dd9d..fef0b52 100644
--- a/src/eom-window.c
+++ b/src/eom-window.c
@@ -4932,32 +4932,6 @@ eom_window_button_press (GtkWidget *widget, GdkEventButton *event)
return result;
}
-#if !GTK_CHECK_VERSION (3, 0, 0)
-static gboolean
-eom_window_window_state_event (GtkWidget *widget,
- GdkEventWindowState *event)
-{
- EomWindow *window;
-
- g_return_val_if_fail (EOM_IS_WINDOW (widget), TRUE);
-
- window = EOM_WINDOW (widget);
-
- if (event->changed_mask &
- (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) {
- gboolean show;
-
- show = !(event->new_window_state &
- (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN));
-
- eom_statusbar_set_has_resize_grip (EOM_STATUSBAR (window->priv->statusbar),
- show);
- }
-
- return FALSE;
-}
-#endif
-
static gboolean
eom_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
{
@@ -5072,9 +5046,6 @@ eom_window_class_init (EomWindowClass *class)
widget_class->key_press_event = eom_window_key_press;
widget_class->button_press_event = eom_window_button_press;
widget_class->drag_data_received = eom_window_drag_data_received;
-#if !GTK_CHECK_VERSION (3, 0, 0)
- widget_class->window_state_event = eom_window_window_state_event;
-#endif
widget_class->focus_out_event = eom_window_focus_out_event;
/**