aboutsummaryrefslogtreecommitdiff
path: root/src/FbWinFrame.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbWinFrame.cc')
-rw-r--r--src/FbWinFrame.cc25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 2c59798..7734497 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -29,12 +29,11 @@
29#include "FbTk/SimpleCommand.hh" 29#include "FbTk/SimpleCommand.hh"
30#include "FbTk/Compose.hh" 30#include "FbTk/Compose.hh"
31#include "FbTk/Transparent.hh" 31#include "FbTk/Transparent.hh"
32#include "CompareWindow.hh" 32#include "FbTk/CompareEqual.hh"
33#include "FbWinFrameTheme.hh" 33#include "FbWinFrameTheme.hh"
34#include "Screen.hh" 34#include "Screen.hh"
35 35
36#include "IconButton.hh" 36#include "IconButton.hh"
37#include "Container.hh"
38 37
39#ifdef SHAPE 38#ifdef SHAPE
40#include "Shape.hh" 39#include "Shape.hh"
@@ -150,7 +149,7 @@ bool FbWinFrame::setTabMode(TabMode tabmode) {
150 } else { 149 } else {
151 m_tab_container.setUpdateLock(true); 150 m_tab_container.setUpdateLock(true);
152 151
153 m_tab_container.setAlignment(Container::RELATIVE); 152 m_tab_container.setAlignment(FbTk::Container::RELATIVE);
154 m_tab_container.setOrientation(FbTk::ROT0); 153 m_tab_container.setOrientation(FbTk::ROT0);
155 if (m_tab_container.parent()->window() == m_screen.rootWindow().window()) { 154 if (m_tab_container.parent()->window() == m_screen.rootWindow().window()) {
156 m_layeritem.removeWindow(m_tab_container); 155 m_layeritem.removeWindow(m_tab_container);
@@ -336,7 +335,7 @@ void FbWinFrame::alignTabs() {
336 case TOPLEFT: 335 case TOPLEFT:
337 if (orig_orient != FbTk::ROT0) m_tab_container.hide(); 336 if (orig_orient != FbTk::ROT0) m_tab_container.hide();
338 m_tab_container.setOrientation(FbTk::ROT0); 337 m_tab_container.setOrientation(FbTk::ROT0);
339 m_tab_container.setAlignment(Container::LEFT); 338 m_tab_container.setAlignment(FbTk::Container::LEFT);
340 m_tab_container.setMaxTotalSize(m_window.width()); 339 m_tab_container.setMaxTotalSize(m_window.width());
341 tabx = x(); 340 tabx = x();
342 taby = y() - yOffset(); 341 taby = y() - yOffset();
@@ -344,7 +343,7 @@ void FbWinFrame::alignTabs() {
344 case TOPRIGHT: 343 case TOPRIGHT:
345 if (orig_orient != FbTk::ROT0) m_tab_container.hide(); 344 if (orig_orient != FbTk::ROT0) m_tab_container.hide();
346 m_tab_container.setOrientation(FbTk::ROT0); 345 m_tab_container.setOrientation(FbTk::ROT0);
347 m_tab_container.setAlignment(Container::RIGHT); 346 m_tab_container.setAlignment(FbTk::Container::RIGHT);
348 m_tab_container.setMaxTotalSize(m_window.width()); 347 m_tab_container.setMaxTotalSize(m_window.width());
349 tabx = x() + width() - m_tab_container.width(); 348 tabx = x() + width() - m_tab_container.width();
350 taby = y() - yOffset(); 349 taby = y() - yOffset();
@@ -352,7 +351,7 @@ void FbWinFrame::alignTabs() {
352 case LEFTTOP: 351 case LEFTTOP:
353 if (orig_orient != FbTk::ROT270) m_tab_container.hide(); 352 if (orig_orient != FbTk::ROT270) m_tab_container.hide();
354 m_tab_container.setOrientation(FbTk::ROT270); 353 m_tab_container.setOrientation(FbTk::ROT270);
355 m_tab_container.setAlignment(Container::RIGHT); 354 m_tab_container.setAlignment(FbTk::Container::RIGHT);
356 m_tab_container.setMaxTotalSize(m_window.height()); 355 m_tab_container.setMaxTotalSize(m_window.height());
357 tabx = x() - xOffset(); 356 tabx = x() - xOffset();
358 taby = y(); 357 taby = y();
@@ -360,7 +359,7 @@ void FbWinFrame::alignTabs() {
360 case LEFTBOTTOM: 359 case LEFTBOTTOM:
361 if (orig_orient != FbTk::ROT270) m_tab_container.hide(); 360 if (orig_orient != FbTk::ROT270) m_tab_container.hide();
362 m_tab_container.setOrientation(FbTk::ROT270); 361 m_tab_container.setOrientation(FbTk::ROT270);
363 m_tab_container.setAlignment(Container::LEFT); 362 m_tab_container.setAlignment(FbTk::Container::LEFT);
364 m_tab_container.setMaxTotalSize(m_window.height()); 363 m_tab_container.setMaxTotalSize(m_window.height());
365 tabx = x() - xOffset(); 364 tabx = x() - xOffset();
366 taby = y() + height() - m_tab_container.height(); 365 taby = y() + height() - m_tab_container.height();
@@ -368,7 +367,7 @@ void FbWinFrame::alignTabs() {
368 case RIGHTTOP: 367 case RIGHTTOP:
369 if (orig_orient != FbTk::ROT90) m_tab_container.hide(); 368 if (orig_orient != FbTk::ROT90) m_tab_container.hide();
370 m_tab_container.setOrientation(FbTk::ROT90); 369 m_tab_container.setOrientation(FbTk::ROT90);
371 m_tab_container.setAlignment(Container::LEFT); 370 m_tab_container.setAlignment(FbTk::Container::LEFT);
372 m_tab_container.setMaxTotalSize(m_window.height()); 371 m_tab_container.setMaxTotalSize(m_window.height());
373 tabx = x() + width() + m_window.borderWidth(); 372 tabx = x() + width() + m_window.borderWidth();
374 taby = y(); 373 taby = y();
@@ -376,7 +375,7 @@ void FbWinFrame::alignTabs() {
376 case RIGHTBOTTOM: 375 case RIGHTBOTTOM:
377 if (orig_orient != FbTk::ROT90) m_tab_container.hide(); 376 if (orig_orient != FbTk::ROT90) m_tab_container.hide();
378 m_tab_container.setOrientation(FbTk::ROT90); 377 m_tab_container.setOrientation(FbTk::ROT90);
379 m_tab_container.setAlignment(Container::RIGHT); 378 m_tab_container.setAlignment(FbTk::Container::RIGHT);
380 m_tab_container.setMaxTotalSize(m_window.height()); 379 m_tab_container.setMaxTotalSize(m_window.height());
381 tabx = x() + width() + m_window.borderWidth(); 380 tabx = x() + width() + m_window.borderWidth();
382 taby = y() + height() - m_tab_container.height(); 381 taby = y() + height() - m_tab_container.height();
@@ -384,7 +383,7 @@ void FbWinFrame::alignTabs() {
384 case BOTTOMLEFT: 383 case BOTTOMLEFT:
385 if (orig_orient != FbTk::ROT0) m_tab_container.hide(); 384 if (orig_orient != FbTk::ROT0) m_tab_container.hide();
386 m_tab_container.setOrientation(FbTk::ROT0); 385 m_tab_container.setOrientation(FbTk::ROT0);
387 m_tab_container.setAlignment(Container::LEFT); 386 m_tab_container.setAlignment(FbTk::Container::LEFT);
388 m_tab_container.setMaxTotalSize(m_window.width()); 387 m_tab_container.setMaxTotalSize(m_window.width());
389 tabx = x(); 388 tabx = x();
390 taby = y() + height() + m_window.borderWidth(); 389 taby = y() + height() + m_window.borderWidth();
@@ -392,7 +391,7 @@ void FbWinFrame::alignTabs() {
392 case BOTTOMRIGHT: 391 case BOTTOMRIGHT:
393 if (orig_orient != FbTk::ROT0) m_tab_container.hide(); 392 if (orig_orient != FbTk::ROT0) m_tab_container.hide();
394 m_tab_container.setOrientation(FbTk::ROT0); 393 m_tab_container.setOrientation(FbTk::ROT0);
395 m_tab_container.setAlignment(Container::RIGHT); 394 m_tab_container.setAlignment(FbTk::Container::RIGHT);
396 m_tab_container.setMaxTotalSize(m_window.width()); 395 m_tab_container.setMaxTotalSize(m_window.width());
397 tabx = x() + width() - m_tab_container.width(); 396 tabx = x() + width() - m_tab_container.width();
398 taby = y() + height() + m_window.borderWidth(); 397 taby = y() + height() + m_window.borderWidth();
@@ -1453,8 +1452,8 @@ void FbWinFrame::applyTabContainer() {
1453 m_tab_container.setBackgroundColor(*tabcontainer_color); 1452 m_tab_container.setBackgroundColor(*tabcontainer_color);
1454 1453
1455 // and the labelbuttons in it 1454 // and the labelbuttons in it
1456 Container::ItemList::iterator btn_it = m_tab_container.begin(); 1455 FbTk::Container::ItemList::iterator btn_it = m_tab_container.begin();
1457 Container::ItemList::iterator btn_it_end = m_tab_container.end(); 1456 FbTk::Container::ItemList::iterator btn_it_end = m_tab_container.end();
1458 for (; btn_it != btn_it_end; ++btn_it) { 1457 for (; btn_it != btn_it_end; ++btn_it) {
1459 IconButton *btn = static_cast<IconButton *>(*btn_it); 1458 IconButton *btn = static_cast<IconButton *>(*btn_it);
1460 btn->reconfigTheme(); 1459 btn->reconfigTheme();