aboutsummaryrefslogtreecommitdiff
path: root/src/FbWinFrame.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbWinFrame.cc')
-rw-r--r--src/FbWinFrame.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 1c34efd..9acccaf 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -244,13 +244,13 @@ void FbWinFrame::moveResize(int x, int y, unsigned int width, unsigned int heigh
244 m_state.saveGeometry(window().x(), window().y(), 244 m_state.saveGeometry(window().x(), window().y(),
245 window().width(), window().height()); 245 window().width(), window().height());
246 246
247 if (move || (resize && m_screen.getTabPlacement() != TOPLEFT && 247 if (move || (resize && *m_screen.getTabPlacementResource() != TOPLEFT &&
248 m_screen.getTabPlacement() != LEFTTOP)) 248 *m_screen.getTabPlacementResource() != LEFTTOP))
249 alignTabs(); 249 alignTabs();
250 250
251 if (resize) { 251 if (resize) {
252 if (m_tabmode == EXTERNAL) { 252 if (m_tabmode == EXTERNAL) {
253 switch(m_screen.getTabPlacement()) { 253 switch(*m_screen.getTabPlacementResource()) {
254 case LEFTTOP: 254 case LEFTTOP:
255 case RIGHTTOP: 255 case RIGHTTOP:
256 case LEFT: 256 case LEFT:
@@ -275,7 +275,7 @@ void FbWinFrame::quietMoveResize(int x, int y,
275 window().width(), window().height()); 275 window().width(), window().height());
276 if (m_tabmode == EXTERNAL) { 276 if (m_tabmode == EXTERNAL) {
277 277
278 switch(m_screen.getTabPlacement()) { 278 switch(*m_screen.getTabPlacementResource()) {
279 case LEFTTOP: 279 case LEFTTOP:
280 case RIGHTTOP: 280 case RIGHTTOP:
281 case LEFT: 281 case LEFT:
@@ -304,7 +304,7 @@ void FbWinFrame::alignTabs() {
304 m_tab_container.setMaxSizePerClient(m_screen.getTabWidth()); 304 m_tab_container.setMaxSizePerClient(m_screen.getTabWidth());
305 305
306 int tabx = 0, taby = 0; 306 int tabx = 0, taby = 0;
307 switch (m_screen.getTabPlacement()) { 307 switch (*m_screen.getTabPlacementResource()) {
308 case TOPLEFT: 308 case TOPLEFT:
309 if (orig_orient != FbTk::ROT0) m_tab_container.hide(); 309 if (orig_orient != FbTk::ROT0) m_tab_container.hide();
310 m_tab_container.setOrientation(FbTk::ROT0); 310 m_tab_container.setOrientation(FbTk::ROT0);
@@ -894,7 +894,7 @@ void FbWinFrame::reconfigure() {
894 894
895 if (m_tabmode == EXTERNAL) { 895 if (m_tabmode == EXTERNAL) {
896 unsigned int neww, newh; 896 unsigned int neww, newh;
897 switch (m_screen.getTabPlacement()) { 897 switch (*m_screen.getTabPlacementResource()) {
898 case TOPLEFT: 898 case TOPLEFT:
899 case TOP: 899 case TOP:
900 case TOPRIGHT: 900 case TOPRIGHT:
@@ -1624,7 +1624,7 @@ int FbWinFrame::widthOffset() const {
1624 return 0; 1624 return 0;
1625 1625
1626 // same height offset for top and bottom tabs 1626 // same height offset for top and bottom tabs
1627 switch (m_screen.getTabPlacement()) { 1627 switch (*m_screen.getTabPlacementResource()) {
1628 case LEFTTOP: 1628 case LEFTTOP:
1629 case RIGHTTOP: 1629 case RIGHTTOP:
1630 case LEFT: 1630 case LEFT:
@@ -1643,7 +1643,7 @@ int FbWinFrame::heightOffset() const {
1643 if (m_tabmode != EXTERNAL || !m_use_tabs) 1643 if (m_tabmode != EXTERNAL || !m_use_tabs)
1644 return 0; 1644 return 0;
1645 1645
1646 switch (m_screen.getTabPlacement()) { 1646 switch (*m_screen.getTabPlacementResource()) {
1647 case TOPLEFT: 1647 case TOPLEFT:
1648 case TOP: 1648 case TOP:
1649 case TOPRIGHT: 1649 case TOPRIGHT:
@@ -1662,7 +1662,7 @@ int FbWinFrame::xOffset() const {
1662 if (m_tabmode != EXTERNAL || !m_use_tabs) 1662 if (m_tabmode != EXTERNAL || !m_use_tabs)
1663 return 0; 1663 return 0;
1664 1664
1665 switch (m_screen.getTabPlacement()) { 1665 switch (*m_screen.getTabPlacementResource()) {
1666 case LEFTTOP: 1666 case LEFTTOP:
1667 case LEFT: 1667 case LEFT:
1668 case LEFTBOTTOM: 1668 case LEFTBOTTOM:
@@ -1678,7 +1678,7 @@ int FbWinFrame::yOffset() const {
1678 if (m_tabmode != EXTERNAL || !m_use_tabs) 1678 if (m_tabmode != EXTERNAL || !m_use_tabs)
1679 return 0; 1679 return 0;
1680 1680
1681 switch (m_screen.getTabPlacement()) { 1681 switch (*m_screen.getTabPlacementResource()) {
1682 case TOPLEFT: 1682 case TOPLEFT:
1683 case TOP: 1683 case TOP:
1684 case TOPRIGHT: 1684 case TOPRIGHT: