[Xfce4-commits] [apps/xfce4-screensaver] 03/05: Revert "Fix lock dialog styling"

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 2f96013db7bb384dbdc6b7e0deb0533e1696e820
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Mon Jun 17 05:35:18 2019 -0400

    Revert "Fix lock dialog styling"
    
    This reverts commit 864f6fb3aea7dac95c16adf0e1c8b3c97d758962.
---
 src/Makefile.am                  |  5 +++++
 src/xfce4-screensaver-dialog.c   | 10 ++++++++++
 src/xfce4-screensaver-dialog.css |  2 ++
 src/xfce4-screensaver-dialog.ui  |  3 +--
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 28c597e..79fb5af 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -103,6 +103,7 @@ test_window_LDADD = \
 	$(NULL)
 
 xfce4_screensaver_dialog_built_sources = \
+	xfce4-screensaver-dialog-css.h  \
 	xfce4-screensaver-dialog-ui.h
 
 xfce4_screensaver_dialog_SOURCES = \
@@ -264,6 +265,9 @@ xfce4_screensaver_preferences_LDADD = \
 
 if MAINTAINER_MODE
 
+xfce4-screensaver-dialog-css.h: $(srcdir)/xfce4-screensaver-dialog.css Makefile
+	$(AM_V_GEN) exo-csource --static --name=xfce4_screensaver_dialog_css $< >$@
+
 xfce4-screensaver-dialog-ui.h: $(srcdir)/xfce4-screensaver-dialog.ui Makefile
 	$(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=xfce4_screensaver_dialog_ui $< >$@
 
@@ -285,6 +289,7 @@ EXTRA_DIST = \
 	gs-marshal.list                   \
 	xfcekbd-indicator-marshal.list    \
 	xfce4-screensaver.desktop.in      \
+	xfce4-screensaver-dialog.css      \
 	xfce4-screensaver-dialog.ui       \
 	xfce4-screensaver-preferences.ui  \
 	$(NULL)
diff --git a/src/xfce4-screensaver-dialog.c b/src/xfce4-screensaver-dialog.c
index 498224d..3fb33d9 100644
--- a/src/xfce4-screensaver-dialog.c
+++ b/src/xfce4-screensaver-dialog.c
@@ -43,6 +43,7 @@
 #include "gs-debug.h"
 #include "gs-lock-plug.h"
 #include "setuid.h"
+#include "xfce4-screensaver-dialog-css.h"
 
 #define MAX_FAILURES 5
 
@@ -377,6 +378,7 @@ static void show_cb(GtkWidget *widget,
 
 static gboolean popup_dialog_idle(void) {
     GtkWidget      *widget;
+    GtkCssProvider *css_provider;
 
     gs_profile_start(NULL);
 
@@ -405,6 +407,14 @@ static gboolean popup_dialog_idle(void) {
     g_signal_connect(GS_LOCK_PLUG(widget), "response", G_CALLBACK(response_cb), NULL);
     g_signal_connect(widget, "show", G_CALLBACK(show_cb), NULL);
 
+    css_provider = gtk_css_provider_new ();
+    gtk_css_provider_load_from_data (css_provider,
+                                     xfce4_screensaver_dialog_css,
+                                     xfce4_screensaver_dialog_css_length,
+                                     NULL);
+    gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), GTK_STYLE_PROVIDER (css_provider),
+                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
     gtk_widget_realize(widget);
     gtk_widget_show(widget);
 
diff --git a/src/xfce4-screensaver-dialog.css b/src/xfce4-screensaver-dialog.css
new file mode 100644
index 0000000..9c55467
--- /dev/null
+++ b/src/xfce4-screensaver-dialog.css
@@ -0,0 +1,2 @@
+/* Workaround for Adwaita - and other themes - setting a smaller font for the keycap window */
+#login_window.keycap { font-size: initial; }
diff --git a/src/xfce4-screensaver-dialog.ui b/src/xfce4-screensaver-dialog.ui
index 00a26a5..7b14ad8 100644
--- a/src/xfce4-screensaver-dialog.ui
+++ b/src/xfce4-screensaver-dialog.ui
@@ -3,7 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkEventBox" id="lock-dialog">
-    <property name="name"></property>
+    <property name="name">login_window</property>
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
@@ -80,7 +80,6 @@
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkEntry" id="auth-prompt-entry">
-                                <property name="name">user_combobox</property>
                                 <property name="can_focus">True</property>
                                 <property name="visibility">False</property>
                                 <property name="activates_default">True</property>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.