SHA256
1
0
forked from pool/gdm
gdm/gdm-save-panel-space-on-low-resolutions.patch

53 lines
2.3 KiB
Diff
Raw Normal View History

Index: gdm-2.25.92/gui/simple-greeter/gdm-greeter-panel.c
===================================================================
--- gdm-2.25.92.orig/gui/simple-greeter/gdm-greeter-panel.c
+++ gdm-2.25.92/gui/simple-greeter/gdm-greeter-panel.c
@@ -571,6 +571,7 @@ gdm_greeter_panel_init (GdmGreeterPanel
{
NaTray *tray;
GtkWidget *spacer;
+ GdkScreen *screen;
gdm_profile_start (NULL);
@@ -648,7 +649,15 @@ gdm_greeter_panel_init (GdmGreeterPanel
panel->priv->clock = gdm_clock_widget_new ();
gtk_box_pack_end (GTK_BOX (panel->priv->hbox),
GTK_WIDGET (panel->priv->clock), FALSE, FALSE, 6);
- gtk_widget_show (panel->priv->clock);
+
+ screen = gtk_widget_get_screen (panel->priv->clock);
+ if (!screen)
+ screen = gdk_screen_get_default ();
+
+ /* If resolution is limited, hide clock to conserve horizontal space */
+
+ if (!screen || gdk_screen_get_width (screen) > 1024)
+ gtk_widget_show (panel->priv->clock);
tray = na_tray_new_for_screen (gtk_window_get_screen (GTK_WINDOW (panel)),
GTK_ORIENTATION_HORIZONTAL);
Index: gdm-2.25.92/gui/simple-greeter/gdm-option-widget.c
===================================================================
--- gdm-2.25.92.orig/gui/simple-greeter/gdm-option-widget.c
+++ gdm-2.25.92/gui/simple-greeter/gdm-option-widget.c
@@ -618,8 +618,17 @@ gdm_option_widget_check_visibility (GdmO
(widget->priv->number_of_top_rows > 0 ||
widget->priv->number_of_middle_rows > 1 ||
widget->priv->number_of_bottom_rows > 0)) {
+ GdkScreen *screen;
gtk_widget_show (widget->priv->items_combo_box);
- gtk_widget_show (widget->priv->label);
+ screen = gtk_widget_get_screen (widget->priv->label);
+ if (!screen)
+ screen = gdk_screen_get_default ();
+
+ /* If resolution is limited, hide labels to conserve horizontal space */
+
+ if (!screen || gdk_screen_get_width (screen) > 1280)
+ gtk_widget_show (widget->priv->label);
+
if (widget->priv->icon_name != NULL) {
gtk_widget_show (widget->priv->image);