[shotwell/wip/libdazzle: 5/5] Temporarily move top searchbar from revealer to box



commit f0b4ae42d0e9a92235b35f71158373ba20123d7c
Author: Jens Georg <mail jensge org>
Date:   Fri Apr 3 21:38:15 2020 +0200

    Temporarily move top searchbar from revealer to box

 src/SearchFilter.vala          | 2 +-
 src/library/LibraryWindow.vala | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index 9a88cf2e..f8f9c6d6 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -619,7 +619,7 @@ public class SearchFilterActions {
     }
 }
 
-public class SearchFilterToolbar : Gtk.Revealer {
+public class SearchFilterToolbar : Gtk.Box {
     private Gtk.Toolbar toolbar;
     private const int FILTER_BUTTON_MARGIN = 12; // the distance between icon and edge of button
     private const float FILTER_ICON_STAR_SCALE = 0.65f; // changes the size of the filter icon
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index 2ee66e58..1bf48028 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -1088,6 +1088,7 @@ public class LibraryWindow : AppWindow {
         sidebar_paned.set_position(1000);
         
         ((Gtk.Container)client_paned.get_top_edge()).add(search_toolbar);
+        search_toolbar.hexpand = true;
         ((Gtk.Container)client_paned.get_left_edge()).add(sidebar_paned);
 
         sidebar_tree.set_size_request(SIDEBAR_MIN_WIDTH, -1);
@@ -1221,7 +1222,7 @@ public class LibraryWindow : AppWindow {
     
     // Turns the search bar on or off.  Note that if show is true, page must not be null.
     private void toggle_search_bar(bool show, CheckerboardPage? page = null) {
-        search_toolbar.set_reveal_child(show);
+        client_paned.top_visible = show;
         if (show) {
             assert(null != page);
             search_toolbar.set_view_filter(page.get_search_view_filter());


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]