[gtk/wip/exalm/titlebuttons: 1/2] Add GtkWindowControls
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/exalm/titlebuttons: 1/2] Add GtkWindowControls
- Date: Sat, 25 Apr 2020 09:53:38 +0000 (UTC)
commit 4004547eb808dbba6da09286f6e7278ecb9a54e2
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Fri Apr 24 17:56:52 2020 +0500
Add GtkWindowControls
Move some code out of GtkHeaderBar and into a separate widget, making it
reusable in process.
See https://gitlab.gnome.org/GNOME/gtk/issues/2242
gtk/gtk.h | 1 +
gtk/gtkwindowcontrols.c | 633 +++++++++++++++++++++++++++++++++++++++++
gtk/gtkwindowcontrols.h | 54 ++++
gtk/meson.build | 2 +
gtk/theme/Adwaita/_common.scss | 79 +++--
5 files changed, 739 insertions(+), 30 deletions(-)
---
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 8fe078e6a9..a51891e9bc 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -252,6 +252,7 @@
#include <gtk/gtkwidget.h>
#include <gtk/gtkwidgetpaintable.h>
#include <gtk/gtkwindow.h>
+#include <gtk/gtkwindowcontrols.h>
#include <gtk/gtkwindowgroup.h>
#include <gtk/gtk-autocleanups.h>
diff --git a/gtk/gtkwindowcontrols.c b/gtk/gtkwindowcontrols.c
new file mode 100644
index 0000000000..090daf7f97
--- /dev/null
+++ b/gtk/gtkwindowcontrols.c
@@ -0,0 +1,633 @@
+/*
+ * Copyright (c) 2020 Alexander Mikhaylenko <alexm gnome org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#include "gtkwindowcontrols.h"
+
+#include "gtkaccessible.h"
+#include "gtkactionable.h"
+#include "gtkboxlayout.h"
+#include "gtkbutton.h"
+#include "gtkenums.h"
+#include "gtkimage.h"
+#include "gtkintl.h"
+#include "gtknative.h"
+#include "gtkprivate.h"
+#include "gtkstylecontext.h"
+#include "gtktypebuiltins.h"
+#include "gtkwindowprivate.h"
+
+/**
+ * SECTION:gtkwindowcontrols
+ * @Short_description: A widget displaying window buttons
+ * @Title: GtkWindowControls
+ * @See_also: #GtkHeaderBar
+ *
+ * GtkWindowControls shows window frame controls, such as minimize, maximize
+ * and close buttons, and the window icon.
+ *
+ * #GtkWindowControls only displays start or end part of the controls (see
+ * #GtkWindowControls:pack-type), so it's intended to be always used in pair
+ * with another #GtkWindowControls using the opposite pack type, for example:
+ *
+ * |[
+ * <object class="GtkBox">
+ * <child>
+ * <object class="GtkWindowControls">
+ * <property name="pack-type">start</property>
+ * </object>
+ * </child>
+ *
+ * ...
+ *
+ * <child>
+ * <object class="GtkWindowControls">
+ * <property name="pack-type">end</property>
+ * </object>
+ * </child>
+ * </object>
+ * ]|
+ *
+ * # CSS nodes
+ *
+ * |[<!-- language="plain" -->
+ * windowcontrols
+ * ├── [image.icon]
+ * ├── [button.minimize]
+ * ├── [button.maximize]
+ * ╰── [button.close]
+ * ]|
+ *
+ * A #GtkWindowControls' CSS node is called windowcontrols. It contains
+ * subnodes corresponding to each title button. Which of the title buttons
+ * exist and where they are placed exactly depends on the desktop environment
+ * and #GtkWindowControls:decoration-layout value.
+ */
+
+struct _GtkWindowControls {
+ GtkWidget parent_instance;
+
+ GtkPackType pack_type;
+ char *decoration_layout;
+ GdkSurfaceState state;
+};
+
+enum {
+ PROP_0,
+ PROP_PACK_TYPE,
+ PROP_DECORATION_LAYOUT,
+ LAST_PROP
+};
+
+static GParamSpec *props[LAST_PROP] = { NULL, };
+
+G_DEFINE_TYPE (GtkWindowControls, gtk_window_controls, GTK_TYPE_WIDGET)
+
+static char *
+get_layout (GtkWindowControls *self)
+{
+ GtkWidget *widget = GTK_WIDGET (self);
+ GtkWidget *toplevel;
+ char *layout_desc, *layout_half;
+ char **tokens;
+
+ toplevel = GTK_WIDGET (gtk_widget_get_root (widget));
+ if (!GTK_IS_WINDOW (toplevel))
+ return NULL;
+
+ if (self->decoration_layout)
+ layout_desc = g_strdup (self->decoration_layout);
+ else
+ g_object_get (gtk_widget_get_settings (widget),
+ "gtk-decoration-layout", &layout_desc,
+ NULL);
+
+ tokens = g_strsplit (layout_desc, ":", 2);
+
+ switch (self->pack_type)
+ {
+ case GTK_PACK_START:
+ layout_half = g_strdup (tokens[0]);
+ break;
+
+ case GTK_PACK_END:
+ layout_half = g_strdup (tokens[1]);
+ break;
+
+ default:
+ g_assert_not_reached ();
+ }
+
+ g_free (layout_desc);
+ g_strfreev (tokens);
+
+ return layout_half;
+}
+
+static gboolean
+update_window_icon (GtkWindow *window,
+ GtkWidget *icon)
+{
+ GdkPaintable *paintable;
+ int scale;
+
+ scale = gtk_widget_get_scale_factor (icon);
+ paintable = gtk_window_get_icon_for_size (window, 20 * scale);
+
+ if (paintable)
+ {
+ gtk_image_set_from_paintable (GTK_IMAGE (icon), paintable);
+ g_object_unref (paintable);
+ gtk_widget_show (icon);
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+clear_controls (GtkWindowControls *self)
+{
+ GtkWidget *child = gtk_widget_get_first_child (GTK_WIDGET (self));
+
+ while (child)
+ {
+ GtkWidget *next = gtk_widget_get_next_sibling (child);
+
+ gtk_widget_unparent (child);
+
+ child = next;
+ }
+}
+
+static void
+update_window_buttons (GtkWindowControls *self)
+{
+ GtkWidget *widget = GTK_WIDGET (self);
+ GtkWidget *toplevel;
+ GtkWindow *window;
+ char *layout;
+ char **tokens;
+ int i;
+ gboolean is_sovereign_window;
+ gboolean empty = TRUE;
+
+ toplevel = GTK_WIDGET (gtk_widget_get_root (widget));
+ if (!GTK_IS_WINDOW (toplevel))
+ {
+ gtk_widget_set_visible (widget, FALSE);
+
+ return;
+ }
+
+ clear_controls (self);
+
+ window = GTK_WINDOW (toplevel);
+
+ is_sovereign_window = !gtk_window_get_modal (window) &&
+ gtk_window_get_transient_for (window) == NULL;
+
+ layout = get_layout (self);
+
+ if (!layout)
+ {
+ gtk_widget_set_visible (widget, FALSE);
+
+ return;
+ }
+
+ tokens = g_strsplit (layout, ",", -1);
+
+ for (i = 0; tokens[i]; i++)
+ {
+ GtkWidget *button = NULL;
+ GtkWidget *image = NULL;
+ AtkObject *accessible;
+
+ if (strcmp (tokens[i], "icon") == 0 &&
+ is_sovereign_window)
+ {
+ button = gtk_image_new ();
+ gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
+ gtk_widget_add_css_class (button, "icon");
+
+ if (!update_window_icon (window, button))
+ {
+ g_object_ref_sink (button);
+ g_object_unref (button);
+ button = NULL;
+ }
+ }
+ else if (strcmp (tokens[i], "minimize") == 0 &&
+ is_sovereign_window)
+ {
+ button = gtk_button_new ();
+ gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
+ gtk_widget_add_css_class (button, "minimize");
+ image = gtk_image_new_from_icon_name ("window-minimize-symbolic");
+ g_object_set (image, "use-fallback", TRUE, NULL);
+ gtk_container_add (GTK_CONTAINER (button), image);
+ gtk_widget_set_can_focus (button, FALSE);
+ gtk_actionable_set_action_name (GTK_ACTIONABLE (button),
+ "window.minimize");
+
+ accessible = gtk_widget_get_accessible (button);
+ if (GTK_IS_ACCESSIBLE (accessible))
+ atk_object_set_name (accessible, _("Minimize"));
+ }
+ else if (strcmp (tokens[i], "maximize") == 0 &&
+ gtk_window_get_resizable (window) &&
+ is_sovereign_window)
+ {
+ const char *icon_name;
+ gboolean maximized = gtk_window_is_maximized (window);
+
+ icon_name = maximized ? "window-restore-symbolic" : "window-maximize-symbolic";
+ button = gtk_button_new ();
+ gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
+ gtk_widget_add_css_class (button, "maximize");
+ image = gtk_image_new_from_icon_name (icon_name);
+ g_object_set (image, "use-fallback", TRUE, NULL);
+ gtk_container_add (GTK_CONTAINER (button), image);
+ gtk_widget_set_can_focus (button, FALSE);
+ gtk_actionable_set_action_name (GTK_ACTIONABLE (button),
+ "window.toggle-maximized");
+
+ accessible = gtk_widget_get_accessible (button);
+ if (GTK_IS_ACCESSIBLE (accessible))
+ atk_object_set_name (accessible, maximized ? _("Restore") : _("Maximize"));
+ }
+ else if (strcmp (tokens[i], "close") == 0 &&
+ gtk_window_get_deletable (window))
+ {
+ button = gtk_button_new ();
+ gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
+ image = gtk_image_new_from_icon_name ("window-close-symbolic");
+ gtk_widget_add_css_class (button, "close");
+ g_object_set (image, "use-fallback", TRUE, NULL);
+ gtk_container_add (GTK_CONTAINER (button), image);
+ gtk_widget_set_can_focus (button, FALSE);
+ gtk_actionable_set_action_name (GTK_ACTIONABLE (button),
+ "window.close");
+
+ accessible = gtk_widget_get_accessible (button);
+ if (GTK_IS_ACCESSIBLE (accessible))
+ atk_object_set_name (accessible, _("Close"));
+ }
+
+ if (button)
+ {
+ gtk_widget_set_parent (button, widget);
+ empty = FALSE;
+ }
+ }
+ g_strfreev (tokens);
+
+ gtk_widget_set_visible (widget, !empty);
+}
+
+static void
+surface_state_changed (GtkWindowControls *self)
+{
+ GtkNative *native;
+ GdkSurface *surface;
+ GdkSurfaceState changed, new_state;
+
+ native = gtk_widget_get_native (GTK_WIDGET (self));
+ surface = gtk_native_get_surface (native);
+ new_state = gdk_toplevel_get_state (GDK_TOPLEVEL (surface));
+ changed = new_state ^ self->state;
+ self->state = new_state;
+
+ if (changed & (GDK_SURFACE_STATE_FULLSCREEN |
+ GDK_SURFACE_STATE_MAXIMIZED |
+ GDK_SURFACE_STATE_TILED |
+ GDK_SURFACE_STATE_TOP_TILED |
+ GDK_SURFACE_STATE_RIGHT_TILED |
+ GDK_SURFACE_STATE_BOTTOM_TILED |
+ GDK_SURFACE_STATE_LEFT_TILED))
+ update_window_buttons (self);
+}
+
+static void
+window_notify_cb (GtkWindowControls *self,
+ GParamSpec *pspec,
+ GtkWindow *window)
+{
+ if (pspec->name == I_("deletable") ||
+ pspec->name == I_("icon-name") ||
+ pspec->name == I_("modal") ||
+ pspec->name == I_("resizable") ||
+ pspec->name == I_("transient-for"))
+ update_window_buttons (self);
+}
+
+static void
+gtk_window_controls_realize (GtkWidget *widget)
+{
+ GtkSettings *settings;
+ GtkWidget *root;
+
+ GTK_WIDGET_CLASS (gtk_window_controls_parent_class)->realize (widget);
+
+ settings = gtk_widget_get_settings (widget);
+ g_signal_connect_swapped (settings, "notify::gtk-decoration-layout",
+ G_CALLBACK (update_window_buttons), widget);
+ g_signal_connect_swapped (gtk_native_get_surface (gtk_widget_get_native (widget)), "notify::state",
+ G_CALLBACK (surface_state_changed), widget);
+
+ root = GTK_WIDGET (gtk_widget_get_root (widget));
+
+ if (GTK_IS_WINDOW (root))
+ g_signal_connect_swapped (root, "notify",
+ G_CALLBACK (window_notify_cb), widget);
+
+ update_window_buttons (GTK_WINDOW_CONTROLS (widget));
+}
+
+static void
+gtk_window_controls_unrealize (GtkWidget *widget)
+{
+ GtkSettings *settings;
+
+ settings = gtk_widget_get_settings (widget);
+
+ g_signal_handlers_disconnect_by_func (settings, update_window_buttons, widget);
+ g_signal_handlers_disconnect_by_func (gtk_native_get_surface (gtk_widget_get_native (widget)),
surface_state_changed, widget);
+ g_signal_handlers_disconnect_by_func (gtk_widget_get_root (widget), window_notify_cb, widget);
+
+ GTK_WIDGET_CLASS (gtk_window_controls_parent_class)->unrealize (widget);
+}
+
+static void
+gtk_window_controls_root (GtkWidget *widget)
+{
+ GTK_WIDGET_CLASS (gtk_window_controls_parent_class)->root (widget);
+
+ update_window_buttons (GTK_WINDOW_CONTROLS (widget));
+}
+
+static void
+gtk_window_controls_finalize (GObject *object)
+{
+ GtkWindowControls *self = GTK_WINDOW_CONTROLS (object);
+
+ clear_controls (self);
+
+ g_free (self->decoration_layout);
+
+ G_OBJECT_CLASS (gtk_window_controls_parent_class)->finalize (object);
+}
+
+static void
+gtk_window_controls_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkWindowControls *self = GTK_WINDOW_CONTROLS (object);
+
+ switch (prop_id)
+ {
+ case PROP_PACK_TYPE:
+ g_value_set_enum (value, gtk_window_controls_get_pack_type (self));
+ break;
+
+ case PROP_DECORATION_LAYOUT:
+ g_value_set_string (value, gtk_window_controls_get_decoration_layout (self));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_window_controls_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GtkWindowControls *self = GTK_WINDOW_CONTROLS (object);
+
+ switch (prop_id)
+ {
+ case PROP_PACK_TYPE:
+ gtk_window_controls_set_pack_type (self, g_value_get_enum (value));
+ break;
+
+ case PROP_DECORATION_LAYOUT:
+ gtk_window_controls_set_decoration_layout (self, g_value_get_string (value));
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_window_controls_class_init (GtkWindowControlsClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+ object_class->finalize = gtk_window_controls_finalize;
+ object_class->get_property = gtk_window_controls_get_property;
+ object_class->set_property = gtk_window_controls_set_property;
+
+ widget_class->realize = gtk_window_controls_realize;
+ widget_class->unrealize = gtk_window_controls_unrealize;
+ widget_class->root = gtk_window_controls_root;
+
+ /**
+ * GtkWindowControls:pack-type:
+ *
+ * Whether the widget shows start or end portion of the decoration layout.
+ *
+ * See gtk_window_controls_set_decoration_layout().
+ */
+ props[PROP_PACK_TYPE] =
+ g_param_spec_enum ("pack-type",
+ P_("Pack type"),
+ P_("Whether the widget shows start or end portion of the decoration layout"),
+ GTK_TYPE_PACK_TYPE,
+ GTK_PACK_START,
+ GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
+ /**
+ * GtkWindowControls:decoration-layout:
+ *
+ * The decoration layout for window buttons. If this property is not set,
+ * the #GtkSettings:gtk-decoration-layout setting is used.
+ *
+ * See gtk_window_controls_set_decoration_layout() for information
+ * about the format of this string.
+ */
+ props[PROP_DECORATION_LAYOUT] =
+ g_param_spec_string ("decoration-layout",
+ P_("Decoration Layout"),
+ P_("The layout for window decorations"),
+ NULL,
+ GTK_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+
+ g_object_class_install_properties (object_class, LAST_PROP, props);
+
+ gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BOX_LAYOUT);
+ gtk_widget_class_set_css_name (widget_class, I_("windowcontrols"));
+}
+
+static void
+gtk_window_controls_init (GtkWindowControls *self)
+{
+ self->decoration_layout = NULL;
+ self->state = GDK_SURFACE_STATE_WITHDRAWN;
+ self->pack_type = GTK_PACK_START;
+
+ gtk_widget_add_css_class (GTK_WIDGET (self), "start");
+
+ gtk_widget_set_can_focus (GTK_WIDGET (self), FALSE);
+}
+
+/**
+ * gtk_window_controls_new:
+ * @pack_type: the pack type
+ *
+ * Creates a new #GtkWindowControls.
+ *
+ * Returns: a new #GtkWindowControls.
+ **/
+GtkWidget *
+gtk_window_controls_new (GtkPackType pack_type)
+{
+ return g_object_new (GTK_TYPE_WINDOW_CONTROLS,
+ "pack-type", pack_type,
+ NULL);
+}
+
+/**
+ * gtk_window_controls_get_pack_type:
+ * @self: a #GtkWindowControls
+ *
+ * Gets the pack type set with gtk_window_controls_set_pack_type().
+ *
+ * Returns: the pack type
+ */
+GtkPackType
+gtk_window_controls_get_pack_type (GtkWindowControls *self)
+{
+ g_return_val_if_fail (GTK_IS_WINDOW_CONTROLS (self), GTK_PACK_START);
+
+ return self->pack_type;
+}
+
+/**
+ * gtk_window_controls_set_pack_type:
+ * @self: a #GtkWindowControls
+ * @pack_type: a pack type
+ *
+ * Sets the pack type for @self. @GTK_PACK_START means using
+ *
+ * See gtk_window_controls_set_decoration_layout()
+ */
+void
+gtk_window_controls_set_pack_type (GtkWindowControls *self,
+ GtkPackType pack_type)
+{
+ g_return_if_fail (GTK_IS_WINDOW_CONTROLS (self));
+
+ if (self->pack_type == pack_type)
+ return;
+
+ self->pack_type = pack_type;
+
+ switch (pack_type)
+ {
+ case GTK_PACK_START:
+ gtk_widget_add_css_class (GTK_WIDGET (self), "start");
+ gtk_widget_remove_css_class (GTK_WIDGET (self), "end");
+ break;
+
+ case GTK_PACK_END:
+ gtk_widget_add_css_class (GTK_WIDGET (self), "end");
+ gtk_widget_remove_css_class (GTK_WIDGET (self), "start");
+ break;
+
+ default:
+ g_warning ("Unexpected pack type: %d", pack_type);
+ break;
+ }
+
+ update_window_buttons (self);
+
+ g_object_notify_by_pspec (G_OBJECT (self), props[PROP_PACK_TYPE]);
+}
+
+/**
+ * gtk_window_controls_get_decoration_layout:
+ * @self: a #GtkWindowControls
+ *
+ * Gets the decoration layout set with
+ * gtk_window_controls_set_decoration_layout().
+ *
+ * Returns: the decoration layout
+ */
+const char *
+gtk_window_controls_get_decoration_layout (GtkWindowControls *self)
+{
+ g_return_val_if_fail (GTK_IS_WINDOW_CONTROLS (self), NULL);
+
+ return self->decoration_layout;
+}
+
+/**
+ * gtk_window_controls_set_decoration_layout:
+ * @self: a #GtkWindowControls
+ * @layout: (allow-none): a decoration layout, or %NULL to
+ * unset the layout
+ *
+ * Sets the decoration layout for the title buttons, overriding
+ * the #GtkSettings:gtk-decoration-layout setting.
+ *
+ * The format of the string is button names, separated by commas.
+ * A colon separates the buttons that should appear on the left
+ * from those on the right. Recognized button names are minimize,
+ * maximize, close and icon (the window icon).
+ *
+ * For example, “icon:minimize,maximize,close” specifies a icon
+ * on the left, and minimize, maximize and close buttons on the right.
+ *
+ * If #GtkWindowControls:pack-type value is @GTK_PACK_START, @self will
+ * display the part before the colon, otherwise after that.
+ */
+void
+gtk_window_controls_set_decoration_layout (GtkWindowControls *self,
+ const char *layout)
+{
+ g_return_if_fail (GTK_IS_WINDOW_CONTROLS (self));
+
+ g_free (self->decoration_layout);
+ self->decoration_layout = g_strdup (layout);
+
+ update_window_buttons (self);
+
+ g_object_notify_by_pspec (G_OBJECT (self), props[PROP_DECORATION_LAYOUT]);
+}
diff --git a/gtk/gtkwindowcontrols.h b/gtk/gtkwindowcontrols.h
new file mode 100644
index 0000000000..e3cd9a93e8
--- /dev/null
+++ b/gtk/gtkwindowcontrols.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2020 Alexander Mikhaylenko <alexm gnome org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#pragma once
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/gtkwidget.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_WINDOW_CONTROLS (gtk_window_controls_get_type ())
+
+GDK_AVAILABLE_IN_ALL
+G_DECLARE_FINAL_TYPE (GtkWindowControls, gtk_window_controls, GTK, WINDOW_CONTROLS, GtkWidget)
+
+GDK_AVAILABLE_IN_ALL
+GtkWidget * gtk_window_controls_new (GtkPackType pack_type);
+
+GDK_AVAILABLE_IN_ALL
+GtkPackType gtk_window_controls_get_pack_type (GtkWindowControls *self);
+
+GDK_AVAILABLE_IN_ALL
+void gtk_window_controls_set_pack_type (GtkWindowControls *self,
+ GtkPackType pack_type);
+
+GDK_AVAILABLE_IN_ALL
+const char * gtk_window_controls_get_decoration_layout (GtkWindowControls *self);
+
+GDK_AVAILABLE_IN_ALL
+void gtk_window_controls_set_decoration_layout (GtkWindowControls *self,
+ const char *layout);
+
+GDK_AVAILABLE_IN_ALL
+gboolean gtk_window_controls_get_empty (GtkWindowControls *self);
+
+G_END_DECLS
diff --git a/gtk/meson.build b/gtk/meson.build
index e78375df7e..108fa2826e 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -390,6 +390,7 @@ gtk_public_sources = files([
'gtkwidgetfocus.c',
'gtkwidgetpaintable.c',
'gtkwindow.c',
+ 'gtkwindowcontrols.c',
'gtkwindowgroup.c',
])
@@ -620,6 +621,7 @@ gtk_public_headers = files([
'gtkwidget.h',
'gtkwidgetpaintable.h',
'gtkwindow.h',
+ 'gtkwindowcontrols.h',
'gtkwindowgroup.h',
'gtk-a11y.h',
'gtk-autocleanups.h',
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index fdc84820b8..61b213a044 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1418,6 +1418,41 @@ searchbar {
}
+/*****************
+ * Title buttons *
+ *****************/
+
+windowcontrols {
+ border-spacing: 6px;
+
+ &.start:dir(ltr),
+ &.end:dir(rtl) {
+ margin-right: 7px;
+ }
+
+ &.start:dir(rtl),
+ &.end:dir(ltr) {
+ margin-left: 7px;
+ }
+
+ button {
+ @extend %button_basic;
+
+ @extend %button_basic_flat;
+
+ &:not(.menu) {
+ border-radius: 9999px;
+ padding: 6px;
+ margin: 0 2px;
+ min-width: 0;
+ min-height: 0;
+ }
+
+ &:backdrop { -gtk-icon-shadow: none; }
+ }
+}
+
+
/***************
* Header bars *
***************/
@@ -1489,19 +1524,21 @@ headerbar {
min-height: 28px;
padding: 4px;
- button.titlebutton,
- menubutton.titlebutton {
- min-height: 26px;
- min-width: 26px;
- margin: 0;
- padding: 0;
- }
+ windowcontrols {
+ button,
+ menubutton {
+ min-height: 26px;
+ min-width: 26px;
+ margin: 0;
+ padding: 0;
+ }
- menubutton.titlebutton button {
- min-height: 20px;
- min-width: 20px;
- margin: 0;
- padding: 4px;
+ menubutton button {
+ min-height: 20px;
+ min-width: 20px;
+ margin: 0;
+ padding: 4px;
+ }
}
}
@@ -4114,24 +4151,6 @@ decoration {
}
}
-// Window Close button
-button.titlebutton {
- @extend %button_basic;
-
- @extend %button_basic_flat;
-
-
- &:not(.menu) {
- border-radius: 9999px;
- padding: 6px;
- margin: 0 2px;
- min-width: 0;
- min-height: 0;
- }
-
- &:backdrop { -gtk-icon-shadow: none; }
-}
-
// catch all extend :)
%selected_items {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
