summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-wm/fluxbox/files/fix-hidden-toolbar.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-wm/fluxbox/files/fix-hidden-toolbar.patch')
-rw-r--r--x11-wm/fluxbox/files/fix-hidden-toolbar.patch92
1 files changed, 92 insertions, 0 deletions
diff --git a/x11-wm/fluxbox/files/fix-hidden-toolbar.patch b/x11-wm/fluxbox/files/fix-hidden-toolbar.patch
new file mode 100644
index 000000000000..e5e5a552c392
--- /dev/null
+++ b/x11-wm/fluxbox/files/fix-hidden-toolbar.patch
@@ -0,0 +1,92 @@
+--- a/src/Toolbar.cc
++++ b/src/Toolbar.cc
+@@ -80,18 +80,18 @@ const struct {
+ unsigned int shape;
+ } _values[] = {
+ { /* unused */ },
+- { Toolbar::TOPLEFT, "TopLeft", FbTk::ROT0, FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT},
+- { Toolbar::TOPCENTER, "TopCenter", FbTk::ROT0, FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+- { Toolbar::TOPRIGHT, "TopRight", FbTk::ROT0, FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT},
+- { Toolbar::BOTTOMLEFT, "BottomLeft", FbTk::ROT0, FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+- { Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0, FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+- { Toolbar::BOTTOMRIGHT, "BottomRight", FbTk::ROT0, FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+- { Toolbar::LEFTBOTTOM, "LeftBottom", FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+- { Toolbar::LEFTCENTER, "LeftCenter", FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+- { Toolbar::LEFTTOP, "LeftTop", FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+- { Toolbar::RIGHTBOTTOM, "RightBottom", FbTk::ROT90, FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
+- { Toolbar::RIGHTCENTER, "RightCenter", FbTk::ROT90, FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
+- { Toolbar::RIGHTTOP, "RightTop", FbTk::ROT90, FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
++ { Toolbar::TOPLEFT, "TopLeft", FbTk::ROT0, FbTk::Shape::BOTTOMRIGHT },
++ { Toolbar::TOPCENTER, "TopCenter", FbTk::ROT0, FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT },
++ { Toolbar::TOPRIGHT, "TopRight", FbTk::ROT0, FbTk::Shape::BOTTOMLEFT },
++ { Toolbar::BOTTOMLEFT, "BottomLeft", FbTk::ROT0, FbTk::Shape::TOPRIGHT },
++ { Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0, FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT },
++ { Toolbar::BOTTOMRIGHT, "BottomRight", FbTk::ROT0, FbTk::Shape::TOPLEFT },
++ { Toolbar::LEFTBOTTOM, "LeftBottom", FbTk::ROT270, FbTk::Shape::TOPRIGHT },
++ { Toolbar::LEFTCENTER, "LeftCenter", FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT },
++ { Toolbar::LEFTTOP, "LeftTop", FbTk::ROT270, FbTk::Shape::BOTTOMRIGHT },
++ { Toolbar::RIGHTBOTTOM, "RightBottom", FbTk::ROT90, FbTk::Shape::TOPLEFT },
++ { Toolbar::RIGHTCENTER, "RightCenter", FbTk::ROT90, FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT },
++ { Toolbar::RIGHTTOP, "RightTop", FbTk::ROT90, FbTk::Shape::BOTTOMLEFT },
+ };
+
+ }
+@@ -648,24 +648,29 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
+ break;
+ case TOPCENTER:
+ frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
++ frame.x_hidden = frame.x;
+ frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
+ break;
+ case TOPRIGHT:
+ frame.x += head_w - static_cast<int>(frame.width) - bw*2;
++ frame.x_hidden = frame.x;
+ frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
+ break;
+ case BOTTOMRIGHT:
+ frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+ frame.y += head_h - static_cast<int>(frame.height) - bw*2;
++ frame.x_hidden = frame.x;
+ frame.y_hidden += head_h - bw - pixel;
+ break;
+ case BOTTOMCENTER: // default is BOTTOMCENTER
+ frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
+ frame.y += head_h - static_cast<int>(frame.height) - bw*2;
++ frame.x_hidden = frame.x;
+ frame.y_hidden += head_h - bw - pixel;
+ break;
+ case LEFTCENTER:
+ frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
++ frame.y_hidden = frame.y;
+ frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
+ break;
+ case LEFTTOP:
+@@ -673,21 +678,24 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
+ break;
+ case LEFTBOTTOM:
+ frame.y = head_h - static_cast<int>(frame.height) - bw*2;
++ frame.y_hidden = frame.y;
+ frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
+ break;
+ case RIGHTCENTER:
+ frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+- frame.y += (head_h - static_cast<int>(frame.height))/2 * bw;
+- frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;
++ frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
++ frame.x_hidden += head_w - bw - pixel;
++ frame.y_hidden = frame.y;
+ break;
+ case RIGHTTOP:
+ frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+- frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;
++ frame.x_hidden += head_w - bw - pixel;
+ break;
+ case RIGHTBOTTOM:
+ frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+ frame.y += head_h - static_cast<int>(frame.height) - bw*2;
+- frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;
++ frame.x_hidden += head_w - bw - pixel;
++ frame.y_hidden = frame.y;
+ break;
+ }
+