diff options
| author | Andrew P. <pan.pav.7c5@gmail.com> | 2014-06-08 17:40:13 +0300 |
|---|---|---|
| committer | Andrew P. <pan.pav.7c5@gmail.com> | 2014-06-08 17:40:13 +0300 |
| commit | 076d8fc3b76e3c2797ecdca85375e5d16b900a64 (patch) | |
| tree | f5c6f848d3fb4f5f3680c6d115560c36344b19a8 | |
| parent | 5faf00646bddacd13a3daae34f6f324918c29bc3 (diff) | |
| download | lightdm-gtk-greeter-git-076d8fc3b76e3c2797ecdca85375e5d16b900a64.tar.gz | |
Using GreeterMenuBar directly in .glade file
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/greetermenubar.c | 8 | ||||
| -rw-r--r-- | src/lightdm-gtk-greeter.c | 2 | ||||
| -rw-r--r-- | src/lightdm-gtk-greeter.glade | 2 |
4 files changed, 3 insertions, 13 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e148345..976f475 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,9 +40,7 @@ lightdm_gtk_greeter_LDADD = \ if MAINTAINER_MODE lightdm-gtk-greeter-ui.h: $(srcdir)/lightdm-gtk-greeter.glade Makefile - $(AM_V_GEN) sed "s/GtkMenuBar/GreeterMenuBar/g" $< > $(srcdir)/lightdm-gtk-greeter-temp.glade - $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=lightdm_gtk_greeter_ui $(srcdir)/lightdm-gtk-greeter-temp.glade >$@ - $(AM_V_GEN) rm -f $(srcdir)/lightdm-gtk-greeter-temp.glade + $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=lightdm_gtk_greeter_ui $< >$@ DISTCLEANFILES = \ $(lightdm_gtk_greeter_built_sources) diff --git a/src/greetermenubar.c b/src/greetermenubar.c index 08b5729..dd383e5 100644 --- a/src/greetermenubar.c +++ b/src/greetermenubar.c @@ -293,12 +293,6 @@ greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation) gint max_size = requested_sizes[GPOINTER_TO_INT(first_item->data)].size.width; gint total_needed_size = 0; - - /* Free space that all widgets need to have the same (max_size) width - * [___max_width___][widget ][widget____ ] - * total_needed_size := [] + [ ] + [ ] - * total_needed_size = [ ] - */ for(item = g_list_next(expand_nums); item; item = g_list_next(item)) total_needed_size += max_size - requested_sizes[GPOINTER_TO_INT(item->data)].size.width; @@ -306,11 +300,9 @@ greeter_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* allocation) { if(size >= total_needed_size) { - /* total_needed_size is enough for all remaining widgets */ needed_size = max_size + (size - total_needed_size)/expand_count; break; } - /* Removing current maximal widget from list */ total_needed_size -= max_size - requested_sizes[GPOINTER_TO_INT(item->data)].size.width; first_item = g_list_next(first_item); if(first_item) diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c index 596ceb0..d53b2c8 100644 --- a/src/lightdm-gtk-greeter.c +++ b/src/lightdm-gtk-greeter.c @@ -52,7 +52,7 @@ #include <lightdm.h> #include "src/greetermenubar.h" -#include <src/lightdm-gtk-greeter-ui.h> +#include "src/lightdm-gtk-greeter-ui.h" static LightDMGreeter *greeter; static GKeyFile *state; diff --git a/src/lightdm-gtk-greeter.glade b/src/lightdm-gtk-greeter.glade index 0b41bed..b2fe579 100644 --- a/src/lightdm-gtk-greeter.glade +++ b/src/lightdm-gtk-greeter.glade @@ -12,7 +12,7 @@ <group name="power_accelgroup"/> </accel-groups> <child> - <object class="GtkMenuBar" id="menubar"> + <object class="GreeterMenuBar" id="menubar"> <property name="name">menubar</property> <property name="visible">True</property> <property name="can_focus">True</property> |