Attachment #19079 for bug #55117

View | Details | Raw Unified | Return to bug 55117
Collapse All | Expand All

Lines 46-51 struct _PhoshAppGridPrivate { Link Here

(-)a/src/app-grid.c (+10 lines)
46		46
47	GtkWidget *deck;	47	GtkWidget *deck;
48	GtkWidget *search;	48	GtkWidget *search;
		49	GtkWidget *search_apply_revealer;
		50	GtkWidget *search_apply_button;
49	GtkWidget *apps;	51	GtkWidget *apps;
50	GtkWidget *favs;	52	GtkWidget *favs;
51	GtkWidget *favs_revealer;	53	GtkWidget *favs_revealer;
Lines 635-640 on_search_activated (GtkSearchEntry *entry, Link Here
635	if (!gtk_widget_has_focus (GTK_WIDGET (entry)))	637	if (!gtk_widget_has_focus (GTK_WIDGET (entry)))
636	return;	638	return;
637		639
		640	gtk_widget_grab_focus (priv->search_apply_button);
		641
638	/* Don't activate when there isn't an active search */	642	/* Don't activate when there isn't an active search */
639	if (!priv->search_string \|\| *priv->search_string == '\0')	643	if (!priv->search_string \|\| *priv->search_string == '\0')
640	return;	644	return;
Lines 661-666 on_search_lost_focus (GtkWidget *widget, Link Here
661	{	665	{
662	PhoshAppGridPrivate *priv = phosh_app_grid_get_instance_private (self);	666	PhoshAppGridPrivate *priv = phosh_app_grid_get_instance_private (self);
663		667
		668	gtk_revealer_set_reveal_child (GTK_REVEALER (priv->search_apply_revealer), FALSE);
		669
664	gtk_style_context_remove_class (gtk_widget_get_style_context (priv->apps),	670	gtk_style_context_remove_class (gtk_widget_get_style_context (priv->apps),
665	ACTIVE_SEARCH_CLASS);	671	ACTIVE_SEARCH_CLASS);
666		672
Lines 675-680 on_search_gained_focus (GtkWidget *widget, Link Here
675	{	681	{
676	PhoshAppGridPrivate *priv = phosh_app_grid_get_instance_private (self);	682	PhoshAppGridPrivate *priv = phosh_app_grid_get_instance_private (self);
677		683
		684	gtk_revealer_set_reveal_child (GTK_REVEALER (priv->search_apply_revealer), TRUE);
		685
678	if (priv->search_string && *priv->search_string != '\0') {	686	if (priv->search_string && *priv->search_string != '\0') {
679	gtk_style_context_add_class (gtk_widget_get_style_context (priv->apps),	687	gtk_style_context_add_class (gtk_widget_get_style_context (priv->apps),
680	ACTIVE_SEARCH_CLASS);	688	ACTIVE_SEARCH_CLASS);
Lines 735-740 phosh_app_grid_class_init (PhoshAppGridClass *klass) Link Here
735	gtk_widget_class_bind_template_child_private (widget_class, PhoshAppGrid, folder_stack);	743	gtk_widget_class_bind_template_child_private (widget_class, PhoshAppGrid, folder_stack);
736	gtk_widget_class_bind_template_child_private (widget_class, PhoshAppGrid, scrolled_window);	744	gtk_widget_class_bind_template_child_private (widget_class, PhoshAppGrid, scrolled_window);
737	gtk_widget_class_bind_template_child_private (widget_class, PhoshAppGrid, search);	745	gtk_widget_class_bind_template_child_private (widget_class, PhoshAppGrid, search);
		746	gtk_widget_class_bind_template_child_private (widget_class, PhoshAppGrid, search_apply_revealer);
		747	gtk_widget_class_bind_template_child_private (widget_class, PhoshAppGrid, search_apply_button);
738		748
739	gtk_widget_class_bind_template_callback (widget_class, on_folder_edit_toggled);	749	gtk_widget_class_bind_template_callback (widget_class, on_folder_edit_toggled);
740	gtk_widget_class_bind_template_callback (widget_class, on_folder_entry_activated);	750	gtk_widget_class_bind_template_callback (widget_class, on_folder_entry_activated);




                    </style>
                  </object>
                </child>
                <child>
                  <object class="GtkRevealer" id="search_apply_revealer">
                    <property name="visible">1</property>
                    <property name="transition-type">slide-left</property>
                    <child>
                      <object class="GtkButton" id="search_apply_button">
                        <property name="visible">1</property>
                        <property name="margin-start">6</property>
                        <property name="valign">center</property>
                        <property name="width-request">36</property>
                        <property name="height-request">36</property>
                        <child>
                          <object class="GtkImage">
                            <property name="visible">1</property>
                            <property name="icon-name">object-select-symbolic</property>
                            <property name="pixel-size">16</property>
                          </object>
                        </child>
                        <style>
                          <class name="circular"/>
                          <class name="suggested-action"/>
                        </style>
                      </object>
                    </child>
                  </object>
                </child>
                <style>
                  <class name="phosh-search-bar-box"/>
                </style>

Return to bug 55117

Lines 35-40 Link Here

(-)a/src/ui/app-grid.ui (+26 lines)
35	</style>	35	</style>
36	</object>	36	</object>
37	</child>	37	</child>
		38	<child>
		39	<object class="GtkRevealer" id="search_apply_revealer">
		40	<property name="visible">1</property>
		41	<property name="transition-type">slide-left</property>
		42	<child>
		43	<object class="GtkButton" id="search_apply_button">
		44	<property name="visible">1</property>
		45	<property name="margin-start">6</property>
		46	<property name="valign">center</property>
		47	<property name="width-request">36</property>
		48	<property name="height-request">36</property>
		49	<child>
		50	<object class="GtkImage">
		51	<property name="visible">1</property>
		52	<property name="icon-name">object-select-symbolic</property>
		53	<property name="pixel-size">16</property>
		54	</object>
		55	</child>
		56	<style>
		57	<class name="circular"/>
		58	<class name="suggested-action"/>
		59	</style>
		60	</object>
		61	</child>
		62	</object>
		63	</child>
38	<style>	64	<style>
39	<class name="phosh-search-bar-box"/>	65	<class name="phosh-search-bar-box"/>
40	</style>	66	</style>