aboutsummaryrefslogtreecommitdiff
path: root/src/FbWinFrame.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-08-16 12:54:07 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-08-16 12:54:07 (GMT)
commit38654bae459716409ad2ee7975671fc2f131c869 (patch)
tree6f2f3c662f8317f47a422db02d17bff378266817 /src/FbWinFrame.cc
parent06837ba8642b8a126de92f60ae05d5f84bba8bfe (diff)
downloadfluxbox-38654bae459716409ad2ee7975671fc2f131c869.zip
fluxbox-38654bae459716409ad2ee7975671fc2f131c869.tar.bz2
some cleanup
Diffstat (limited to 'src/FbWinFrame.cc')
-rw-r--r--src/FbWinFrame.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index c7eaef3..d0d1e21 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -247,8 +247,8 @@ void FbWinFrame::moveResize(int x, int y, unsigned int width, unsigned int heigh
247 if (move && x == window().x() && y == window().y()) 247 if (move && x == window().x() && y == window().y())
248 move = false; 248 move = false;
249 249
250 if (resize && (m_state.shaded || width == FbWinFrame::width() && 250 if (resize && (m_state.shaded || (width == FbWinFrame::width() &&
251 height == FbWinFrame::height())) 251 height == FbWinFrame::height())))
252 resize = false; 252 resize = false;
253 253
254 if (!move && !resize) 254 if (!move && !resize)
@@ -265,7 +265,7 @@ void FbWinFrame::moveResize(int x, int y, unsigned int width, unsigned int heigh
265 m_window.resize(width, height); 265 m_window.resize(width, height);
266 } 266 }
267 267
268 if (move || resize && m_screen.getTabPlacement() != TOPLEFT) 268 if (move || (resize && m_screen.getTabPlacement() != TOPLEFT))
269 alignTabs(); 269 alignTabs();
270 270
271 if (resize) { 271 if (resize) {
@@ -413,7 +413,7 @@ void FbWinFrame::notifyMoved(bool clear) {
413 if (alpha == 255) 413 if (alpha == 255)
414 return; 414 return;
415 415
416 if (m_tabmode == EXTERNAL && m_use_tabs || m_use_titlebar) { 416 if ((m_tabmode == EXTERNAL && m_use_tabs) || m_use_titlebar) {
417 m_tab_container.parentMoved(); 417 m_tab_container.parentMoved();
418 m_tab_container.for_each(mem_fun(&FbTk::Button::parentMoved)); 418 m_tab_container.for_each(mem_fun(&FbTk::Button::parentMoved));
419 } 419 }
@@ -1430,8 +1430,8 @@ int FbWinFrame::getDecoMaskFromString(const string &str_label) {
1430 if (label == "tab") 1430 if (label == "tab")
1431 return DECOR_TAB; 1431 return DECOR_TAB;
1432 int mask = -1; 1432 int mask = -1;
1433 if (str_label.size() > 1 && str_label[0] == '0' && str_label[1] == 'x' || 1433 if ((str_label.size() > 1 && str_label[0] == '0' && str_label[1] == 'x') ||
1434 str_label.size() > 0 && isdigit(str_label[0])) 1434 (str_label.size() > 0 && isdigit(str_label[0])))
1435 mask = strtol(str_label.c_str(), NULL, 0); 1435 mask = strtol(str_label.c_str(), NULL, 0);
1436 return mask; 1436 return mask;
1437} 1437}