diff options
| author | Michael Webster <miketwebster@gmail.com> | 2017-06-20 11:20:35 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-06-20 11:20:35 +0200 |
| commit | 552dd36c2c012642643cba5692cb90c2300e4dd2 (patch) | |
| tree | e331b69f2bb8dec0373aeab5818992fe50f42880 | |
| parent | 434484b5f0b14c797145666efaefff4c6602c5c5 (diff) | |
| download | arctica-greeter-552dd36c2c012642643cba5692cb90c2300e4dd2.tar.gz arctica-greeter-552dd36c2c012642643cba5692cb90c2300e4dd2.tar.bz2 arctica-greeter-552dd36c2c012642643cba5692cb90c2300e4dd2.zip | |
Fix prompt display in gtk3 > 3.20 (ported from slick-greeter)
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/greeter-list.vala | 4 |
3 files changed, 15 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 9176db7..2b20692 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,16 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", Gettext package) AC_SUBST(GETTEXT_PACKAGE) dnl ########################################################################### +dnl Check for GTK version - 3.20 +dnl ########################################################################### + +PKG_CHECK_MODULES(GTK_3_20_0, gtk+-3.0 >= 3.20.0 , gtk_check_pass=yes, gtk_check_pass=no) +if test x$gtk_check_pass = xyes ; then + AM_VALAFLAGS="$AM_VALAFLAGS -D HAVE_GTK_3_20_0" + AC_SUBST([AM_VALAFLAGS]) +fi + +dnl ########################################################################### dnl Files to generate dnl ########################################################################### diff --git a/src/Makefile.am b/src/Makefile.am index 1fcefc7..ec75868 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,6 +51,7 @@ arctica_greeter_CFLAGS = \ logo_generator_CFLAGS = $(arctica_greeter_CFLAGS) arctica_greeter_VALAFLAGS = \ + $(AM_VALAFLAGS) \ --debug \ --pkg posix \ --pkg gtk+-3.0 \ diff --git a/src/greeter-list.vala b/src/greeter-list.vala index 4734ab1..17d80a8 100644 --- a/src/greeter-list.vala +++ b/src/greeter-list.vala @@ -626,6 +626,10 @@ public abstract class GreeterList : FadableBox focus_prompt (); entry_displayed_done (); mode = Mode.ENTRY; + +#if HAVE_GTK_3_20_0 + queue_allocate (); +#endif } protected void select_entry (PromptBox entry, double direction, bool do_scroll = true) |