Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

window, toolbar-end: ToolbarEnd Fixes

Browse Source 
* Use the sidebar's search entry for search shortcut when folded
* Set context on the sidebar's search entry
* Drop context GtkExpression from gcal-toolbar-end.ui
This commit is contained in:
Christopher Davis
2023-06-17 20:18:07 +00:00
committed by Georges Basile Stavracas Neto
parent ef88f27b4e
commit 5b528032db
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gcal-toolbar-end.ui
-5
View File
@@ -7,11 +7,6 @@
<child>
<object class="GcalSearchButton" id="search_button">
<property name="tooltip_text" translatable="yes" context="tooltip">Search for events</property>
<binding name="context">
<lookup type="GcalWindow" name="context">
<lookup type="GtkWidget" name="root">GcalToolbarEnd</lookup>
</lookup>
</binding>
</object>
</child>
<child>
src/gui/gcal-window.c
+12 -1
View File
@@ -109,6 +109,8 @@ struct _GcalWindow
GtkWidget *action_bar;
GcalSyncIndicator *sync_indicator;
GcalToolbarEnd *toolbar_end;
GcalToolbarEnd *sidebar_toolbar_end;
AdwLeaflet *leaflet;
/* header_bar widets */
GtkWidget *calendars_button;
@@ -860,6 +862,7 @@ gcal_window_constructed (GObject *object)
g_object_bind_property (self, "context", self->quick_add_popover, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
g_object_bind_property (self, "context", self->sync_indicator, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
g_object_bind_property (self, "context", self->toolbar_end, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
g_object_bind_property (self, "context", self->sidebar_toolbar_end, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
/* CSS */
load_css_providers (self);
@@ -1052,6 +1055,8 @@ gcal_window_class_init (GcalWindowClass *klass)
gtk_widget_class_bind_template_child (widget_class, GcalWindow, overlay);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, sync_indicator);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, toolbar_end);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, sidebar_toolbar_end);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, leaflet);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, views_stack);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, views_switcher);
gtk_widget_class_bind_template_child (widget_class, GcalWindow, weather_settings);
@@ -1140,10 +1145,16 @@ gcal_window_set_search_query (GcalWindow *self,
const gchar *query)
{
GtkWidget *search_button;
GcalToolbarEnd *toolbar_end;
g_return_if_fail (GCAL_IS_WINDOW (self));
search_button = gcal_toolbar_end_get_search_button (self->toolbar_end);
if (adw_leaflet_get_folded (self->leaflet))
toolbar_end = self->sidebar_toolbar_end;
else
toolbar_end = self->toolbar_end;
search_button = gcal_toolbar_end_get_search_button (toolbar_end);
gcal_search_button_search (GCAL_SEARCH_BUTTON (search_button), query);
}
src/gui/gcal-window.ui
+1 -1
View File
@@ -168,7 +168,7 @@
</object>
</child>
<child type="end">
<object class="GcalToolbarEnd"/>
<object class="GcalToolbarEnd" id="sidebar_toolbar_end"/>
</child>
</object>
</child>