From ef3fe9ead38feb48a834a6024b41190fe7116f96 Mon Sep 17 00:00:00 2001 From: Nikita Churaev Date: Sun, 18 Mar 2018 13:33:52 +0300 Subject: [PATCH] theme: Be more selective when adding margins to toolbar items Only add margins to direct children of toolbar items, this fixes the gaps between linked buttons inside custom toolbar items. https://gitlab.gnome.org/GNOME/gtk/merge_requests/66 --- gtk/theme/Adwaita/_common.scss | 9 ++++----- gtk/theme/Adwaita/gtk-contained-dark.css | 2 +- gtk/theme/Adwaita/gtk-contained.css | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 840033e1c1..4f7abcbfbc 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1382,11 +1382,10 @@ toolbar { &.vertical separator { margin: 6px 1px 7px 0; } &:not(.inline-toolbar):not(.osd) { - switch, - scale, - entry, - spinbutton, - button { + // workaround: add margins to the children of tool items to simulate + // spacing, ignore the overflow button (.toggle) and the overflow menu + // (.popup) + > *:not(.toggle):not(.popup) > * { margin-right: 1px; margin-bottom: 1px; } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 6de23b77bd..f6f788d6f2 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -567,7 +567,7 @@ toolbar.horizontal separator { margin: 0 7px 1px 6px; } toolbar.vertical separator { margin: 6px 1px 7px 0; } -toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, toolbar:not(.inline-toolbar):not(.osd) spinbutton, toolbar:not(.inline-toolbar):not(.osd) button { margin-right: 1px; margin-bottom: 1px; } +toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin-right: 1px; margin-bottom: 1px; } .inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0 0 5px 5px; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index d528d74094..42b4f8c7a7 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -575,7 +575,7 @@ toolbar.horizontal separator { margin: 0 7px 1px 6px; } toolbar.vertical separator { margin: 6px 1px 7px 0; } -toolbar:not(.inline-toolbar):not(.osd) switch, toolbar:not(.inline-toolbar):not(.osd) scale, toolbar:not(.inline-toolbar):not(.osd) entry, toolbar:not(.inline-toolbar):not(.osd) spinbutton, toolbar:not(.inline-toolbar):not(.osd) button { margin-right: 1px; margin-bottom: 1px; } +toolbar:not(.inline-toolbar):not(.osd) > *:not(.toggle):not(.popup) > * { margin-right: 1px; margin-bottom: 1px; } .inline-toolbar { padding: 3px; border-width: 0 1px 1px; border-radius: 0 0 5px 5px; }