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 d51ffdf..21de2c5 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -263,13 +263,13 @@ void FbWinFrame::moveResize(int x, int y, unsigned int width, unsigned int heigh
263 m_state.saveGeometry(window().x(), window().y(), 263 m_state.saveGeometry(window().x(), window().y(),
264 window().width(), window().height()); 264 window().width(), window().height());
265 265
266 if (move || (resize && m_screen.getTabPlacement() != TOPLEFT && 266 if (move || (resize && *m_screen.getTabPlacementResource() != TOPLEFT &&
267 m_screen.getTabPlacement() != LEFTTOP)) 267 *m_screen.getTabPlacementResource() != LEFTTOP))
268 alignTabs(); 268 alignTabs();
269 269
270 if (resize) { 270 if (resize) {
271 if (m_tabmode == EXTERNAL) { 271 if (m_tabmode == EXTERNAL) {
272 switch(m_screen.getTabPlacement()) { 272 switch(*m_screen.getTabPlacementResource()) {
273 case LEFTTOP: 273 case LEFTTOP:
274 case RIGHTTOP: 274 case RIGHTTOP:
275 case LEFT: 275 case LEFT:
@@ -294,7 +294,7 @@ void FbWinFrame::quietMoveResize(int x, int y,
294 window().width(), window().height()); 294 window().width(), window().height());
295 if (m_tabmode == EXTERNAL) { 295 if (m_tabmode == EXTERNAL) {
296 296
297 switch(m_screen.getTabPlacement()) { 297 switch(*m_screen.getTabPlacementResource()) {
298 case LEFTTOP: 298 case LEFTTOP:
299 case RIGHTTOP: 299 case RIGHTTOP:
300 case LEFT: 300 case LEFT:
@@ -323,7 +323,7 @@ void FbWinFrame::alignTabs() {
323 m_tab_container.setMaxSizePerClient(m_screen.getTabWidth()); 323 m_tab_container.setMaxSizePerClient(m_screen.getTabWidth());
324 324
325 int tabx = 0, taby = 0; 325 int tabx = 0, taby = 0;
326 switch (m_screen.getTabPlacement()) { 326 switch (*m_screen.getTabPlacementResource()) {
327 case TOPLEFT: 327 case TOPLEFT:
328 if (orig_orient != FbTk::ROT0) m_tab_container.hide(); 328 if (orig_orient != FbTk::ROT0) m_tab_container.hide();
329 m_tab_container.setOrientation(FbTk::ROT0); 329 m_tab_container.setOrientation(FbTk::ROT0);
@@ -913,7 +913,7 @@ void FbWinFrame::reconfigure() {
913 913
914 if (m_tabmode == EXTERNAL) { 914 if (m_tabmode == EXTERNAL) {
915 unsigned int neww, newh; 915 unsigned int neww, newh;
916 switch (m_screen.getTabPlacement()) { 916 switch (*m_screen.getTabPlacementResource()) {
917 case TOPLEFT: 917 case TOPLEFT:
918 case TOP: 918 case TOP:
919 case TOPRIGHT: 919 case TOPRIGHT:
@@ -1643,7 +1643,7 @@ int FbWinFrame::widthOffset() const {
1643 return 0; 1643 return 0;
1644 1644
1645 // same height offset for top and bottom tabs 1645 // same height offset for top and bottom tabs
1646 switch (m_screen.getTabPlacement()) { 1646 switch (*m_screen.getTabPlacementResource()) {
1647 case LEFTTOP: 1647 case LEFTTOP:
1648 case RIGHTTOP: 1648 case RIGHTTOP:
1649 case LEFT: 1649 case LEFT:
@@ -1662,7 +1662,7 @@ int FbWinFrame::heightOffset() 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 TOPLEFT: 1666 case TOPLEFT:
1667 case TOP: 1667 case TOP:
1668 case TOPRIGHT: 1668 case TOPRIGHT:
@@ -1681,7 +1681,7 @@ int FbWinFrame::xOffset() const {
1681 if (m_tabmode != EXTERNAL || !m_use_tabs) 1681 if (m_tabmode != EXTERNAL || !m_use_tabs)
1682 return 0; 1682 return 0;
1683 1683
1684 switch (m_screen.getTabPlacement()) { 1684 switch (*m_screen.getTabPlacementResource()) {
1685 case LEFTTOP: 1685 case LEFTTOP:
1686 case LEFT: 1686 case LEFT:
1687 case LEFTBOTTOM: 1687 case LEFTBOTTOM:
@@ -1697,7 +1697,7 @@ int FbWinFrame::yOffset() const {
1697 if (m_tabmode != EXTERNAL || !m_use_tabs) 1697 if (m_tabmode != EXTERNAL || !m_use_tabs)
1698 return 0; 1698 return 0;
1699 1699
1700 switch (m_screen.getTabPlacement()) { 1700 switch (*m_screen.getTabPlacementResource()) {
1701 case TOPLEFT: 1701 case TOPLEFT:
1702 case TOP: 1702 case TOP:
1703 case TOPRIGHT: 1703 case TOPRIGHT: