[gtk/wip/jimmac/adwaita-3-32: 37/38] Merge branch 'wip/jimmac/adwaita-3-32' into 'fix-button-icon-position'

[Jakub Steiner <jimmac src gnome org>]

commit 6f1e611c3b554f56e1682ec201e753366d72672e
Merge: d82edf0c91 17ab084f28
Author: Jakub Steiner <jimmac gmail com>
Date:   Mon Jan 28 10:46:48 2019 +0000

    Merge branch 'wip/jimmac/adwaita-3-32' into 'fix-button-icon-position'
    
    # Conflicts:
    #   gtk/theme/Adwaita/_common.scss
    #   gtk/theme/Adwaita/gtk-contained-dark.css
    #   gtk/theme/Adwaita/gtk-contained.css

 gdk/wayland/gdkapplaunchcontext-wayland.c          |  15 +-
 gdk/wayland/gdkdisplay-wayland.c                   |   2 +-
 gdk/wayland/gdkwindow-wayland.c                    |  18 +-
 gdk/wayland/protocol/gtk-shell.xml                 |  14 +-
 gtk/Makefile.am                                    |   9 +
 gtk/gtkcolorplane.c                                |   2 +-
 gtk/gtkswitch.c                                    | 183 ++++-----
 .../16x16/status/switch-off-symbolic.symbolic.png  | Bin 0 -> 250 bytes
 .../16x16/status/switch-on-symbolic.symbolic.png   | Bin 0 -> 100 bytes
 gtk/icons/scalable/status/switch-off-symbolic.svg  |  62 +++
 gtk/icons/scalable/status/switch-on-symbolic.svg   |  64 ++++
 gtk/theme/Adwaita/_common.scss                     |   4 +-
 gtk/theme/Adwaita/gtk-contained-dark.css           |   2 +-
 gtk/theme/Adwaita/gtk-contained.css                |   2 +-
 modules/input/imquartz.c                           |   2 +-
 modules/printbackends/cups/gtkprintbackendcups.c   |   2 +-
 po/hu.po                                           | 416 ++++++++++-----------
 tests/testentrycompletion.c                        |   2 +-
 tests/testgmenu.c                                  |   4 +-
 19 files changed, 450 insertions(+), 353 deletions(-)
---
diff --cc gtk/theme/Adwaita/gtk-contained-dark.css
index ee900c952c,caf042b2ee..3149bde6ef
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@@ -236,9 -236,9 +236,9 @@@ row:selected button.sidebar-button:not(
  
  row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled):backdrop, 
row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled):backdrop { color: #919190; }
  
 -button.osd { min-width: 26px; min-height: 32px; color: #eeeeec; border-radius: 5px; color: #eeeeec; 
border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(36, 33, 42, 
0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px 
black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: 
none; }
 +button.osd { min-width: 24px; min-height: 32px; color: #eeeeec; border-radius: 5px; color: #eeeeec; 
border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(36, 33, 42, 
0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px 
black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: 
none; }
  
- button.osd.image-button { min-width: 32px; }
+ button.osd.image-button { min-width: 34px; }
  
  button.osd:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; 
background-image: image(rgba(66, 61, 76, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 
238, 236, 0.3); border: none; box-shadow: none; }
  
diff --cc gtk/theme/Adwaita/gtk-contained.css
index bc760bd2c9,f34038aaba..550815c440
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@@ -238,9 -238,9 +238,9 @@@ row:selected button.sidebar-button:not(
  
  row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled):backdrop, 
row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled):backdrop { color: #fcfcfc; }
  
 -button.osd { min-width: 26px; min-height: 32px; color: #eeeeec; border-radius: 5px; color: #eeeeec; 
border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(36, 33, 42, 
0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px 
black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: 
none; }
 +button.osd { min-width: 24px; min-height: 32px; color: #eeeeec; border-radius: 5px; color: #eeeeec; 
border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(36, 33, 42, 
0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: 0 1px 
black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border: none; box-shadow: 
none; }
  
- button.osd.image-button { min-width: 32px; }
+ button.osd.image-button { min-width: 34px; }
  
  button.osd:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; 
background-image: image(rgba(66, 61, 76, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.1); text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 
238, 236, 0.3); border: none; box-shadow: none; }