aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-02-17 09:56:00 (GMT)
committerfluxgen <fluxgen>2003-02-17 09:56:00 (GMT)
commita3e6f621d016f9c99341b884bcdf790416bc67b2 (patch)
tree29cb768b2d0e643a539361ca88de59d8bd75746a
parent2c801101f8e80179fef1c766e9ab3fd449c932f8 (diff)
downloadfluxbox_paul-a3e6f621d016f9c99341b884bcdf790416bc67b2.zip
fluxbox_paul-a3e6f621d016f9c99341b884bcdf790416bc67b2.tar.bz2
minor cleaning
-rw-r--r--src/Window.cc36
1 files changed, 19 insertions, 17 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 517074d..e4c00fe 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.117 2003/02/16 17:57:53 rathnor Exp $ 25// $Id: Window.cc,v 1.118 2003/02/17 09:56:00 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -1136,26 +1136,28 @@ void FluxboxWindow::setLayerNum(int layernum) {
1136} 1136}
1137 1137
1138void FluxboxWindow::shade() { 1138void FluxboxWindow::shade() {
1139 if (decorations.titlebar) { 1139 if (!decorations.titlebar)
1140 // toggle shade on tab and frame 1140 return;
1141 m_frame.shade();
1142 if (tab)
1143 tab->shade();
1144 1141
1145 if (shaded) { 1142 // toggle shade on tab and frame
1146 shaded = false; 1143 m_frame.shade();
1147 blackbox_attrib.flags ^= BaseDisplay::ATTRIB_SHADED; 1144 if (tab)
1148 blackbox_attrib.attrib ^= BaseDisplay::ATTRIB_SHADED; 1145 tab->shade();
1149 1146
1150 setState(NormalState); 1147 if (shaded) {
1151 } else { 1148 shaded = false;
1152 shaded = true; 1149 blackbox_attrib.flags ^= BaseDisplay::ATTRIB_SHADED;
1153 blackbox_attrib.flags |= BaseDisplay::ATTRIB_SHADED; 1150 blackbox_attrib.attrib ^= BaseDisplay::ATTRIB_SHADED;
1154 blackbox_attrib.attrib |= BaseDisplay::ATTRIB_SHADED;
1155 1151
1156 setState(IconicState); 1152 setState(NormalState);
1157 } 1153 } else {
1154 shaded = true;
1155 blackbox_attrib.flags |= BaseDisplay::ATTRIB_SHADED;
1156 blackbox_attrib.attrib |= BaseDisplay::ATTRIB_SHADED;
1157
1158 setState(IconicState);
1158 } 1159 }
1160
1159} 1161}
1160 1162
1161 1163