From 0ac411a90ea56ed6fb54256cb6b67b15f79ebba6 Mon Sep 17 00:00:00 2001
From: Horst3180 <horst3180@users.noreply.github.com>
Date: Fri, 6 May 2016 13:26:30 +0200
Subject: [PATCH 1/2] cinnamon: fix hot corner indicator (fix #511)

---
 common/cinnamon/cinnamon-dark.css             |   8 +-
 common/cinnamon/cinnamon.css                  |   8 +-
 .../common-assets/misc/corner-ripple-ltr.svg  | 125 ------------------
 ...orner-ripple-rtl.svg => corner-ripple.svg} |  26 ++--
 common/cinnamon/sass/_common.scss             |   8 +-
 5 files changed, 27 insertions(+), 148 deletions(-)
 delete mode 100644 common/cinnamon/common-assets/misc/corner-ripple-ltr.svg
 rename common/cinnamon/common-assets/misc/{corner-ripple-rtl.svg => corner-ripple.svg} (75%)

diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css
index 21402ae..c6bb2e3 100644
--- a/common/cinnamon/cinnamon-dark.css
+++ b/common/cinnamon/cinnamon-dark.css
@@ -699,12 +699,10 @@ StScrollBar {
   width: 60px; }
 
 .ripple-box {
-  width: 52px;
-  height: 52px;
-  background-image: url("common-assets/misc/corner-ripple-ltr.svg");
+  width: 104px;
+  height: 104px;
+  background-image: url("common-assets/misc/corner-ripple.svg");
   background-size: contain; }
-  .ripple-box:rtl {
-    background-image: url("common-assets/misc/corner-ripple-rtl.svg"); }
 
 .lightbox {
   background-color: rgba(0, 0, 0, 0.4); }
diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css
index 439d410..a54fd32 100644
--- a/common/cinnamon/cinnamon.css
+++ b/common/cinnamon/cinnamon.css
@@ -699,12 +699,10 @@ StScrollBar {
   width: 60px; }
 
 .ripple-box {
-  width: 52px;
-  height: 52px;
-  background-image: url("common-assets/misc/corner-ripple-ltr.svg");
+  width: 104px;
+  height: 104px;
+  background-image: url("common-assets/misc/corner-ripple.svg");
   background-size: contain; }
-  .ripple-box:rtl {
-    background-image: url("common-assets/misc/corner-ripple-rtl.svg"); }
 
 .lightbox {
   background-color: rgba(0, 0, 0, 0.4); }
diff --git a/common/cinnamon/common-assets/misc/corner-ripple-ltr.svg b/common/cinnamon/common-assets/misc/corner-ripple-ltr.svg
deleted file mode 100644
index 357a544..0000000
--- a/common/cinnamon/common-assets/misc/corner-ripple-ltr.svg
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="52"
-   height="52"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="corner-ripple-ltr.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3857">
-      <stop
-         style="stop-color:#398dd3;stop-opacity:0;"
-         offset="0"
-         id="stop3859" />
-      <stop
-         style="stop-color:#398cd3;stop-opacity:1;"
-         offset="1"
-         id="stop3861" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3857"
-       id="radialGradient3863"
-       cx="0"
-       cy="0"
-       fx="0"
-       fy="0"
-       r="52"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="-19.986036"
-     inkscape:cy="44.805381"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1055"
-     inkscape:window-x="0"
-     inkscape:window-y="20"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originy="2px" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="52,0"
-       id="guide2987" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="52,0"
-       id="guide2989" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,52"
-       id="guide3761" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="0,52"
-       id="guide3763" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="51,1"
-       id="guide3773" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="51,1"
-       id="guide3775" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Ebene 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1000.3622)">
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3863);fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1"
-       id="path2991"
-       sodipodi:cx="0"
-       sodipodi:cy="0"
-       sodipodi:rx="52"
-       sodipodi:ry="52"
-       d="M 52,0 A 52,52 0 1 1 -52,0 52,52 0 1 1 52,0 z"
-       transform="translate(0,1000.3622)" />
-  </g>
-</svg>
diff --git a/common/cinnamon/common-assets/misc/corner-ripple-rtl.svg b/common/cinnamon/common-assets/misc/corner-ripple.svg
similarity index 75%
rename from common/cinnamon/common-assets/misc/corner-ripple-rtl.svg
rename to common/cinnamon/common-assets/misc/corner-ripple.svg
index 57176d2..ff58c92 100644
--- a/common/cinnamon/common-assets/misc/corner-ripple-rtl.svg
+++ b/common/cinnamon/common-assets/misc/corner-ripple.svg
@@ -11,11 +11,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
-   width="52"
-   height="52"
+   width="104.00001"
+   height="104"
    id="svg2"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="corner-ripple-rtl.svg">
+   sodipodi:docname="corner-ripple.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -27,7 +27,16 @@
      inkscape:pageshadow="2"
      inkscape:window-width="640"
      inkscape:window-height="480"
-     id="namedview955" />
+     id="namedview955"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="2.3864854"
+     inkscape:cx="-38.639816"
+     inkscape:cy="27.143174"
+     inkscape:current-layer="svg2" />
   <defs
      id="defs4">
     <linearGradient
@@ -59,17 +68,18 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     transform="translate(0,-1000.3622)"
+     transform="translate(4.9999999e-6,-948.3622)"
      id="layer1">
     <path
-       d="M 52,0 A 52,52 0 1 1 -52,0 52,52 0 1 1 52,0 z"
+       d="M 52,0 A 52,52 0 1 1 -52,0 52,52 0 1 1 52,0 Z"
        transform="translate(52,1000.3622)"
        id="path2991"
-       style="fill:url(#radialGradient3863);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       style="fill:url(#radialGradient3863);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss
index 5a3f27d..b015078 100644
--- a/common/cinnamon/sass/_common.scss
+++ b/common/cinnamon/sass/_common.scss
@@ -849,12 +849,10 @@ StScrollBar {
 //Activities Ripples
 //
 .ripple-box {
-  width: 52px;
-  height: 52px;
-  background-image: url("common-assets/misc/corner-ripple-ltr.svg");
+  width: 104px;
+  height: 104px;
+  background-image: url("common-assets/misc/corner-ripple.svg");
   background-size: contain;
-
-  &:rtl { background-image: url("common-assets/misc/corner-ripple-rtl.svg"); }
 }
 
 //

From e3463fecde0407d390156cf348e6c5368c6759ff Mon Sep 17 00:00:00 2001
From: Horst3180 <horst3180@users.noreply.github.com>
Date: Fri, 6 May 2016 14:18:21 +0200
Subject: [PATCH 2/2] metacity: tweak button placement (fix #492)

---
 common/metacity-1/metacity-theme-1-dark.xml |  9 ++++-----
 common/metacity-1/metacity-theme-1.xml      | 10 +++++-----
 common/metacity-1/metacity-theme-2-dark.xml |  9 ++++-----
 common/metacity-1/metacity-theme-2.xml      |  9 ++++-----
 common/metacity-1/metacity-theme-3.xml      |  4 ++--
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/common/metacity-1/metacity-theme-1-dark.xml b/common/metacity-1/metacity-theme-1-dark.xml
index 36f69f7..5097716 100644
--- a/common/metacity-1/metacity-theme-1-dark.xml
+++ b/common/metacity-1/metacity-theme-1-dark.xml
@@ -44,13 +44,12 @@
 	<distance name="left_width" value="0" />
 	<distance name="right_width" value="0" />
 	<distance name="bottom_height" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="5"/>
+	<distance name="left_titlebar_edge" value="2"/>
+	<distance name="right_titlebar_edge" value="2"/>
 	<distance name="title_vertical_pad" value="3"/>
 	<border name="title_border" left="10" right="10" top="3" bottom="3"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-  <distance name="button_width" value="30"/>
-  <distance name="button_height" value="16"/>
+	<border name="button_border" left="3" right="3" top="0" bottom="0"/>
+	<aspect_ratio name="button" value="1.0" />
 </frame_geometry>
 
 <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal">
diff --git a/common/metacity-1/metacity-theme-1.xml b/common/metacity-1/metacity-theme-1.xml
index 01f4262..71a2695 100644
--- a/common/metacity-1/metacity-theme-1.xml
+++ b/common/metacity-1/metacity-theme-1.xml
@@ -44,13 +44,13 @@
 	<distance name="left_width" value="0" />
 	<distance name="right_width" value="0" />
 	<distance name="bottom_height" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="5"/>
+	<distance name="left_titlebar_edge" value="2"/>
+	<distance name="right_titlebar_edge" value="2"/>
 	<distance name="title_vertical_pad" value="3"/>
 	<border name="title_border" left="10" right="10" top="3" bottom="3"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-  <distance name="button_width" value="30"/>
-  <distance name="button_height" value="16"/>
+	<border name="button_border" left="3" right="3" top="0" bottom="0"/>
+	<aspect_ratio name="button" value="1.0" />
+
 </frame_geometry>
 
 <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal">
diff --git a/common/metacity-1/metacity-theme-2-dark.xml b/common/metacity-1/metacity-theme-2-dark.xml
index 36f69f7..5097716 100644
--- a/common/metacity-1/metacity-theme-2-dark.xml
+++ b/common/metacity-1/metacity-theme-2-dark.xml
@@ -44,13 +44,12 @@
 	<distance name="left_width" value="0" />
 	<distance name="right_width" value="0" />
 	<distance name="bottom_height" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="5"/>
+	<distance name="left_titlebar_edge" value="2"/>
+	<distance name="right_titlebar_edge" value="2"/>
 	<distance name="title_vertical_pad" value="3"/>
 	<border name="title_border" left="10" right="10" top="3" bottom="3"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-  <distance name="button_width" value="30"/>
-  <distance name="button_height" value="16"/>
+	<border name="button_border" left="3" right="3" top="0" bottom="0"/>
+	<aspect_ratio name="button" value="1.0" />
 </frame_geometry>
 
 <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal">
diff --git a/common/metacity-1/metacity-theme-2.xml b/common/metacity-1/metacity-theme-2.xml
index 01f4262..9e94016 100644
--- a/common/metacity-1/metacity-theme-2.xml
+++ b/common/metacity-1/metacity-theme-2.xml
@@ -44,13 +44,12 @@
 	<distance name="left_width" value="0" />
 	<distance name="right_width" value="0" />
 	<distance name="bottom_height" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="5"/>
+	<distance name="left_titlebar_edge" value="2"/>
+	<distance name="right_titlebar_edge" value="2"/>
 	<distance name="title_vertical_pad" value="3"/>
 	<border name="title_border" left="10" right="10" top="3" bottom="3"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
-  <distance name="button_width" value="30"/>
-  <distance name="button_height" value="16"/>
+	<border name="button_border" left="3" right="3" top="0" bottom="0"/>
+	<aspect_ratio name="button" value="1.0" />
 </frame_geometry>
 
 <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal">
diff --git a/common/metacity-1/metacity-theme-3.xml b/common/metacity-1/metacity-theme-3.xml
index ad01884..6a0aeef 100644
--- a/common/metacity-1/metacity-theme-3.xml
+++ b/common/metacity-1/metacity-theme-3.xml
@@ -44,8 +44,8 @@
 	<distance name="left_width" value="0" />
 	<distance name="right_width" value="0" />
 	<distance name="bottom_height" value="0" />
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="5"/>
+	<distance name="left_titlebar_edge" value="2"/>
+	<distance name="right_titlebar_edge" value="2"/>
 	<distance name="title_vertical_pad" value="3"/>
 	<border name="title_border" left="10" right="10" top="3" bottom="3"/>
 	<border name="button_border" left="0" right="0" top="0" bottom="0"/>