diff options
Diffstat (limited to 'src/FbWinFrame.cc')
-rw-r--r-- | src/FbWinFrame.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc index 04e7944..6aa65b0 100644 --- a/src/FbWinFrame.cc +++ b/src/FbWinFrame.cc | |||
@@ -260,13 +260,13 @@ void FbWinFrame::moveResize(int x, int y, unsigned int width, unsigned int heigh | |||
260 | m_state.saveGeometry(window().x(), window().y(), | 260 | m_state.saveGeometry(window().x(), window().y(), |
261 | window().width(), window().height()); | 261 | window().width(), window().height()); |
262 | 262 | ||
263 | if (move || (resize && m_screen.getTabPlacement() != TOPLEFT && | 263 | if (move || (resize && *m_screen.getTabPlacementResource() != TOPLEFT && |
264 | m_screen.getTabPlacement() != LEFTTOP)) | 264 | *m_screen.getTabPlacementResource() != LEFTTOP)) |
265 | alignTabs(); | 265 | alignTabs(); |
266 | 266 | ||
267 | if (resize) { | 267 | if (resize) { |
268 | if (m_tabmode == EXTERNAL) { | 268 | if (m_tabmode == EXTERNAL) { |
269 | switch(m_screen.getTabPlacement()) { | 269 | switch(*m_screen.getTabPlacementResource()) { |
270 | case LEFTTOP: | 270 | case LEFTTOP: |
271 | case RIGHTTOP: | 271 | case RIGHTTOP: |
272 | case LEFT: | 272 | case LEFT: |
@@ -291,7 +291,7 @@ void FbWinFrame::quietMoveResize(int x, int y, | |||
291 | window().width(), window().height()); | 291 | window().width(), window().height()); |
292 | if (m_tabmode == EXTERNAL) { | 292 | if (m_tabmode == EXTERNAL) { |
293 | 293 | ||
294 | switch(m_screen.getTabPlacement()) { | 294 | switch(*m_screen.getTabPlacementResource()) { |
295 | case LEFTTOP: | 295 | case LEFTTOP: |
296 | case RIGHTTOP: | 296 | case RIGHTTOP: |
297 | case LEFT: | 297 | case LEFT: |
@@ -320,7 +320,7 @@ void FbWinFrame::alignTabs() { | |||
320 | m_tab_container.setMaxSizePerClient(m_screen.getTabWidth()); | 320 | m_tab_container.setMaxSizePerClient(m_screen.getTabWidth()); |
321 | 321 | ||
322 | int tabx = 0, taby = 0; | 322 | int tabx = 0, taby = 0; |
323 | switch (m_screen.getTabPlacement()) { | 323 | switch (*m_screen.getTabPlacementResource()) { |
324 | case TOPLEFT: | 324 | case TOPLEFT: |
325 | if (orig_orient != FbTk::ROT0) m_tab_container.hide(); | 325 | if (orig_orient != FbTk::ROT0) m_tab_container.hide(); |
326 | m_tab_container.setOrientation(FbTk::ROT0); | 326 | m_tab_container.setOrientation(FbTk::ROT0); |
@@ -910,7 +910,7 @@ void FbWinFrame::reconfigure() { | |||
910 | 910 | ||
911 | if (m_tabmode == EXTERNAL) { | 911 | if (m_tabmode == EXTERNAL) { |
912 | unsigned int neww, newh; | 912 | unsigned int neww, newh; |
913 | switch (m_screen.getTabPlacement()) { | 913 | switch (*m_screen.getTabPlacementResource()) { |
914 | case TOPLEFT: | 914 | case TOPLEFT: |
915 | case TOP: | 915 | case TOP: |
916 | case TOPRIGHT: | 916 | case TOPRIGHT: |
@@ -1640,7 +1640,7 @@ int FbWinFrame::widthOffset() const { | |||
1640 | return 0; | 1640 | return 0; |
1641 | 1641 | ||
1642 | // same height offset for top and bottom tabs | 1642 | // same height offset for top and bottom tabs |
1643 | switch (m_screen.getTabPlacement()) { | 1643 | switch (*m_screen.getTabPlacementResource()) { |
1644 | case LEFTTOP: | 1644 | case LEFTTOP: |
1645 | case RIGHTTOP: | 1645 | case RIGHTTOP: |
1646 | case LEFT: | 1646 | case LEFT: |
@@ -1659,7 +1659,7 @@ int FbWinFrame::heightOffset() const { | |||
1659 | if (m_tabmode != EXTERNAL || !m_use_tabs) | 1659 | if (m_tabmode != EXTERNAL || !m_use_tabs) |
1660 | return 0; | 1660 | return 0; |
1661 | 1661 | ||
1662 | switch (m_screen.getTabPlacement()) { | 1662 | switch (*m_screen.getTabPlacementResource()) { |
1663 | case TOPLEFT: | 1663 | case TOPLEFT: |
1664 | case TOP: | 1664 | case TOP: |
1665 | case TOPRIGHT: | 1665 | case TOPRIGHT: |
@@ -1678,7 +1678,7 @@ int FbWinFrame::xOffset() 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 LEFTTOP: | 1682 | case LEFTTOP: |
1683 | case LEFT: | 1683 | case LEFT: |
1684 | case LEFTBOTTOM: | 1684 | case LEFTBOTTOM: |
@@ -1694,7 +1694,7 @@ int FbWinFrame::yOffset() const { | |||
1694 | if (m_tabmode != EXTERNAL || !m_use_tabs) | 1694 | if (m_tabmode != EXTERNAL || !m_use_tabs) |
1695 | return 0; | 1695 | return 0; |
1696 | 1696 | ||
1697 | switch (m_screen.getTabPlacement()) { | 1697 | switch (*m_screen.getTabPlacementResource()) { |
1698 | case TOPLEFT: | 1698 | case TOPLEFT: |
1699 | case TOP: | 1699 | case TOP: |
1700 | case TOPRIGHT: | 1700 | case TOPRIGHT: |