[gnome-terminal/wip/headerbar: 8/8] search-popover: Set titlebar when headerbars are used
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-terminal/wip/headerbar: 8/8] search-popover: Set titlebar when headerbars are used
- Date: Mon, 5 Nov 2018 22:29:13 +0000 (UTC)
commit 54172db1cc2d5841b1e2f45ab05d117c096c5eab
Author: Florian Müllner <fmuellner gnome org>
Date: Mon Nov 5 23:24:50 2018 +0100
search-popover: Set titlebar when headerbars are used
While there aren't any controls that make sense to move into the
titlebar, client- and server-side decorations are likely only
consistent under GNOME. So to ensure that all the app's windows
are consistent with each other, set up a default titlebar when
headerbars should be used.
https://bugzilla.gnome.org/show_bug.cgi?id=756798
src/terminal-search-popover.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/src/terminal-search-popover.c b/src/terminal-search-popover.c
index 8d814cf4..bb298c48 100644
--- a/src/terminal-search-popover.c
+++ b/src/terminal-search-popover.c
@@ -384,7 +384,8 @@ terminal_search_popover_init (TerminalSearchPopover *popover)
gtk_popover_set_default_widget (GTK_POPOVER (popover), priv->search_prev_button);
G_GNUC_END_IGNORE_DEPRECATIONS
#else
- gtk_window_set_default (GTK_WINDOW (popover), priv->search_prev_button);
+ GtkWindow *window = GTK_WINDOW (popover);
+ gtk_window_set_default (window, priv->search_prev_button);
#endif
#if GTK_CHECK_VERSION (3, 16, 0)
@@ -411,6 +412,20 @@ terminal_search_popover_init (TerminalSearchPopover *popover)
g_signal_connect (priv->wrap_around_checkbutton, "toggled", G_CALLBACK (wrap_around_toggled_cb), popover);
g_signal_connect (popover, "key-press-event", G_CALLBACK (key_press_cb), NULL);
+
+ if (terminal_app_get_use_headerbar (terminal_app_get ())) {
+ GtkWidget *headerbar;
+
+ headerbar = g_object_new (GTK_TYPE_HEADER_BAR,
+ "title", gtk_window_get_title (window),
+ "has-subtitle", FALSE,
+ "show-close-button", TRUE,
+ "visible", TRUE,
+ NULL);
+ gtk_style_context_add_class (gtk_widget_get_style_context (headerbar),
+ "default-decoration");
+ gtk_window_set_titlebar (window, headerbar);
+ }
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]