[Xfce4-commits] <xfwm4:master> Increase menu button height and redice width to fix bug #5567

Olivier Fourdan fourdan at xfce.org
Mon Aug 17 17:24:01 CEST 2009


Updating branch refs/heads/master
         to 34ed718cba949e8482c9255f076a93a2312d1a99 (commit)
       from 0eb3b2fe3b2ec96c23e1edddd348b42e468e6021 (commit)

commit 34ed718cba949e8482c9255f076a93a2312d1a99
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Mon Aug 17 13:41:38 2009 +0200

    Increase menu button height and redice width to fix bug #5567

 themes/default-4.6/menu-active.png   |  Bin 97 -> 109 bytes
 themes/default-4.6/menu-active.svg   |   16 ++++-------
 themes/default-4.6/menu-active.xpm   |   45 ++++++++++++++++++----------------
 themes/default-4.6/menu-inactive.png |  Bin 97 -> 109 bytes
 themes/default-4.6/menu-inactive.svg |   16 ++++-------
 themes/default-4.6/menu-inactive.xpm |   45 ++++++++++++++++++----------------
 themes/default-4.6/menu-prelight.png |  Bin 97 -> 109 bytes
 themes/default-4.6/menu-prelight.svg |   16 ++++-------
 themes/default-4.6/menu-prelight.xpm |   43 +++++++++++++++++---------------
 themes/default-4.6/menu-pressed.png  |  Bin 97 -> 109 bytes
 themes/default-4.6/menu-pressed.svg  |   16 ++++-------
 themes/default-4.6/menu-pressed.xpm  |   43 +++++++++++++++++---------------
 themes/default/menu-active.xpm       |   12 ++++----
 themes/default/menu-inactive.xpm     |   12 ++++----
 themes/default/menu-prelight.xpm     |   12 ++++----
 themes/default/menu-pressed.xpm      |   12 ++++----
 16 files changed, 142 insertions(+), 146 deletions(-)

diff --git a/themes/default-4.6/menu-active.png b/themes/default-4.6/menu-active.png
index 5de6127..1877667 100644
Binary files a/themes/default-4.6/menu-active.png and b/themes/default-4.6/menu-active.png differ
diff --git a/themes/default-4.6/menu-active.svg b/themes/default-4.6/menu-active.svg
index e5da918..69e79d9 100644
--- a/themes/default-4.6/menu-active.svg
+++ b/themes/default-4.6/menu-active.svg
@@ -8,8 +8,8 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
+   width="18"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -77,12 +77,11 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
-     transform="translate(0,-2)"
      style="display:inline">
     <rect
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
-       width="24"
+       width="18"
        height="21"
        x="0"
        y="1" />
@@ -90,31 +89,28 @@
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     transform="translate(0,-2)"
      inkscape:label="hilight" />
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-2)"
      style="display:inline">
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
-       d="M 0,1.5 L 24,1.5"
+       d="M 0,1.5 L 18,1.5"
        id="path28" />
     <path
        style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
-       d="M 0,0.5 L 24,0.5"
+       d="M 0,0.5 L 18,0.5"
        id="path6059" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer5"
-     transform="translate(0,-2)"
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,21.5 L 23.5,21.5"
+       d="M 0.5,21.5 L 17.5,21.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default-4.6/menu-active.xpm b/themes/default-4.6/menu-active.xpm
index f90106d..6bf4ffc 100644
--- a/themes/default-4.6/menu-active.xpm
+++ b/themes/default-4.6/menu-active.xpm
@@ -1,25 +1,28 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"24 19 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+".................."};
diff --git a/themes/default-4.6/menu-inactive.png b/themes/default-4.6/menu-inactive.png
index 5de6127..1877667 100644
Binary files a/themes/default-4.6/menu-inactive.png and b/themes/default-4.6/menu-inactive.png differ
diff --git a/themes/default-4.6/menu-inactive.svg b/themes/default-4.6/menu-inactive.svg
index 7e67cae..39ffc59 100644
--- a/themes/default-4.6/menu-inactive.svg
+++ b/themes/default-4.6/menu-inactive.svg
@@ -9,8 +9,8 @@
    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="24"
-   height="18"
+   width="18"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -108,12 +108,11 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
-     transform="translate(0,-2)"
      style="display:inline">
     <rect
        style="fill:url(#linearGradient6945);fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
-       width="24"
+       width="18"
        height="21"
        x="0"
        y="1" />
@@ -121,31 +120,28 @@
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     transform="translate(0,-2)"
      inkscape:label="hilight" />
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-2)"
      style="display:inline">
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
-       d="M 0,1.5 L 24,1.5"
+       d="M 0,1.5 L 18,1.5"
        id="path28" />
     <path
        style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
-       d="M 0,0.5 L 24,0.5"
+       d="M 0,0.5 L 18,0.5"
        id="path6059" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer5"
-     transform="translate(0,-2)"
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,21.5 L 23.5,21.5"
+       d="M 0.5,21.5 L 17.5,21.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default-4.6/menu-inactive.xpm b/themes/default-4.6/menu-inactive.xpm
index fb53955..61b916c 100644
--- a/themes/default-4.6/menu-inactive.xpm
+++ b/themes/default-4.6/menu-inactive.xpm
@@ -1,25 +1,28 @@
 /* XPM */
 static char * menu_inactive_xpm[] = {
-"24 19 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+".................."};
diff --git a/themes/default-4.6/menu-prelight.png b/themes/default-4.6/menu-prelight.png
index 5de6127..1877667 100644
Binary files a/themes/default-4.6/menu-prelight.png and b/themes/default-4.6/menu-prelight.png differ
diff --git a/themes/default-4.6/menu-prelight.svg b/themes/default-4.6/menu-prelight.svg
index 59de280..8a7adba 100644
--- a/themes/default-4.6/menu-prelight.svg
+++ b/themes/default-4.6/menu-prelight.svg
@@ -8,8 +8,8 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
+   width="18"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -77,12 +77,11 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
-     transform="translate(0,-2)"
      style="display:inline">
     <rect
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
-       width="24"
+       width="18"
        height="21"
        x="0"
        y="1" />
@@ -90,31 +89,28 @@
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     transform="translate(0,-2)"
      inkscape:label="hilight" />
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-2)"
      style="display:inline">
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
-       d="M 0,1.5 L 24,1.5"
+       d="M 0,1.5 L 18,1.5"
        id="path28" />
     <path
        style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
-       d="M 0,0.5 L 24,0.5"
+       d="M 0,0.5 L 18,0.5"
        id="path6059" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer5"
-     transform="translate(0,-2)"
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,21.5 L 23.5,21.5"
+       d="M 0.5,21.5 L 17.5,21.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default-4.6/menu-prelight.xpm b/themes/default-4.6/menu-prelight.xpm
index ab5be54..e43de68 100644
--- a/themes/default-4.6/menu-prelight.xpm
+++ b/themes/default-4.6/menu-prelight.xpm
@@ -1,24 +1,27 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"24 19 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+".................."};
diff --git a/themes/default-4.6/menu-pressed.png b/themes/default-4.6/menu-pressed.png
index 5de6127..1877667 100644
Binary files a/themes/default-4.6/menu-pressed.png and b/themes/default-4.6/menu-pressed.png differ
diff --git a/themes/default-4.6/menu-pressed.svg b/themes/default-4.6/menu-pressed.svg
index 5ef2134..7514e18 100644
--- a/themes/default-4.6/menu-pressed.svg
+++ b/themes/default-4.6/menu-pressed.svg
@@ -8,8 +8,8 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="18"
+   width="18"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.46"
@@ -77,12 +77,11 @@
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Grad"
-     transform="translate(0,-2)"
      style="display:inline">
     <rect
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linejoin:miter;stroke-opacity:1"
        id="rect6057"
-       width="24"
+       width="18"
        height="21"
        x="0"
        y="1" />
@@ -90,31 +89,28 @@
   <g
      inkscape:groupmode="layer"
      id="layer3"
-     transform="translate(0,-2)"
      inkscape:label="hilight" />
   <g
      inkscape:label="Border"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-2)"
      style="display:inline">
     <path
        style="fill:none;fill-opacity:0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.30"
-       d="M 0,1.5 L 24,1.5"
+       d="M 0,1.5 L 18,1.5"
        id="path28" />
     <path
        style="fill:none;stroke:black;stroke-width:1px;stroke-opacity:0.25"
-       d="M 0,0.5 L 24,0.5"
+       d="M 0,0.5 L 18,0.5"
        id="path6059" />
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer5"
-     transform="translate(0,-2)"
      inkscape:label="Shadow">
     <path
        style="fill:none;fill-opacity:0.50;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linejoin:miter;stroke-opacity:0"
-       d="M 0.5,21.5 L 23.5,21.5"
+       d="M 0.5,21.5 L 17.5,21.5"
        id="path6989" />
   </g>
 </svg>
diff --git a/themes/default-4.6/menu-pressed.xpm b/themes/default-4.6/menu-pressed.xpm
index ab5be54..e43de68 100644
--- a/themes/default-4.6/menu-pressed.xpm
+++ b/themes/default-4.6/menu-pressed.xpm
@@ -1,24 +1,27 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"24 19 2 1",
+"18 22 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................",
-"........................"};
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+"..................",
+".................."};
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 0b60759..95bc94c 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -3,10 +3,6 @@ static char * menu_active_xpm[] = {
 "16 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"                ",
-"                ",
-"                ",
-"                ",
 "................",
 "................",
 "................",
@@ -25,5 +21,9 @@ static char * menu_active_xpm[] = {
 "................",
 "................",
 "................",
-"                ",
-"                "};
+"................",
+"................",
+"................",
+"................",
+"................",
+"................"};
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index c004dee..58c2415 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -3,10 +3,6 @@ static char * menu_inactive_xpm[] = {
 "16 24 2 1",
 " 	c None",
 ".	c #C0C0FF s inactive_color_1",
-"                ",
-"                ",
-"                ",
-"                ",
 "................",
 "................",
 "................",
@@ -25,5 +21,9 @@ static char * menu_inactive_xpm[] = {
 "................",
 "................",
 "................",
-"                ",
-"                "};
+"................",
+"................",
+"................",
+"................",
+"................",
+"................"};
diff --git a/themes/default/menu-prelight.xpm b/themes/default/menu-prelight.xpm
index 0b60759..95bc94c 100644
--- a/themes/default/menu-prelight.xpm
+++ b/themes/default/menu-prelight.xpm
@@ -3,10 +3,6 @@ static char * menu_active_xpm[] = {
 "16 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"                ",
-"                ",
-"                ",
-"                ",
 "................",
 "................",
 "................",
@@ -25,5 +21,9 @@ static char * menu_active_xpm[] = {
 "................",
 "................",
 "................",
-"                ",
-"                "};
+"................",
+"................",
+"................",
+"................",
+"................",
+"................"};
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 0b60759..95bc94c 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -3,10 +3,6 @@ static char * menu_active_xpm[] = {
 "16 24 2 1",
 " 	c None",
 ".	c #C0C0FF s active_color_1",
-"                ",
-"                ",
-"                ",
-"                ",
 "................",
 "................",
 "................",
@@ -25,5 +21,9 @@ static char * menu_active_xpm[] = {
 "................",
 "................",
 "................",
-"                ",
-"                "};
+"................",
+"................",
+"................",
+"................",
+"................",
+"................"};



More information about the Xfce4-commits mailing list