diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-08-15 21:03:57 (GMT) |
---|---|---|
committer | Paul Tagliamonte <paultag@fluxbox.org> | 2012-04-07 02:13:13 (GMT) |
commit | bc803c3211f3caa3554c9e96f687701de007b436 (patch) | |
tree | d23fbbeb9affe7a4c3d67cde7c4732dd47625682 /src/FbWinFrame.cc | |
parent | 3012793a8f9151ded4c83da6075919a36dde412f (diff) | |
download | fluxbox_paul-bc803c3211f3caa3554c9e96f687701de007b436.zip fluxbox_paul-bc803c3211f3caa3554c9e96f687701de007b436.tar.bz2 |
Move declarations of Resource enums to a separate file
The reason for this is that I need to access those enums from fluxbox-update_configs and I don't
want to #include and link everything in src.
I also merged Slit::Placement, Toolbar::Placement and FbWinFrame::TabPlacement into one enum.
Diffstat (limited to 'src/FbWinFrame.cc')
-rw-r--r-- | src/FbWinFrame.cc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc index a76df66..7927cd7 100644 --- a/src/FbWinFrame.cc +++ b/src/FbWinFrame.cc | |||
@@ -59,7 +59,7 @@ FbWinFrame::FbWinFrame(BScreen &screen, unsigned int client_depth, | |||
59 | client_depth, InputOutput, | 59 | client_depth, InputOutput, |
60 | ((client_depth == 32) && (screen.rootWindow().depth() == 32) ? screen.rootWindow().visual() : CopyFromParent), | 60 | ((client_depth == 32) && (screen.rootWindow().depth() == 32) ? screen.rootWindow().visual() : CopyFromParent), |
61 | ((client_depth == 32) && (screen.rootWindow().depth() == 32) ? screen.rootWindow().colormap() : CopyFromParent)), | 61 | ((client_depth == 32) && (screen.rootWindow().depth() == 32) ? screen.rootWindow().colormap() : CopyFromParent)), |
62 | m_layeritem(window(), *screen.layerManager().getLayer(ResourceLayer::NORMAL)), | 62 | m_layeritem(window(), *screen.layerManager().getLayer(LAYERNORMAL)), |
63 | m_titlebar(m_window, 0, 0, 100, 16, | 63 | m_titlebar(m_window, 0, 0, 100, 16, |
64 | ButtonPressMask | ButtonReleaseMask | | 64 | ButtonPressMask | ButtonReleaseMask | |
65 | ButtonMotionMask | ExposureMask | | 65 | ButtonMotionMask | ExposureMask | |
@@ -269,8 +269,8 @@ void FbWinFrame::moveResize(int x, int y, unsigned int width, unsigned int heigh | |||
269 | switch(*m_screen.getTabPlacementResource()) { | 269 | switch(*m_screen.getTabPlacementResource()) { |
270 | case LEFTTOP: | 270 | case LEFTTOP: |
271 | case RIGHTTOP: | 271 | case RIGHTTOP: |
272 | case LEFT: | 272 | case LEFTCENTER: |
273 | case RIGHT: | 273 | case RIGHTCENTER: |
274 | case LEFTBOTTOM: | 274 | case LEFTBOTTOM: |
275 | case RIGHTBOTTOM: | 275 | case RIGHTBOTTOM: |
276 | m_tab_container.setMaxTotalSize(height); | 276 | m_tab_container.setMaxTotalSize(height); |
@@ -294,8 +294,8 @@ void FbWinFrame::quietMoveResize(int x, int y, | |||
294 | switch(*m_screen.getTabPlacementResource()) { | 294 | switch(*m_screen.getTabPlacementResource()) { |
295 | case LEFTTOP: | 295 | case LEFTTOP: |
296 | case RIGHTTOP: | 296 | case RIGHTTOP: |
297 | case LEFT: | 297 | case LEFTCENTER: |
298 | case RIGHT: | 298 | case RIGHTCENTER: |
299 | case LEFTBOTTOM: | 299 | case LEFTBOTTOM: |
300 | case RIGHTBOTTOM: | 300 | case RIGHTBOTTOM: |
301 | m_tab_container.setMaxTotalSize(height); | 301 | m_tab_container.setMaxTotalSize(height); |
@@ -329,7 +329,7 @@ void FbWinFrame::alignTabs() { | |||
329 | tabx = x(); | 329 | tabx = x(); |
330 | taby = y() - yOffset(); | 330 | taby = y() - yOffset(); |
331 | break; | 331 | break; |
332 | case TOP: | 332 | case TOPCENTER: |
333 | if (orig_orient != FbTk::ROT0) m_tab_container.hide(); | 333 | if (orig_orient != FbTk::ROT0) m_tab_container.hide(); |
334 | m_tab_container.setOrientation(FbTk::ROT0); | 334 | m_tab_container.setOrientation(FbTk::ROT0); |
335 | m_tab_container.setAlignment(FbTk::Container::CENTER); | 335 | m_tab_container.setAlignment(FbTk::Container::CENTER); |
@@ -353,7 +353,7 @@ void FbWinFrame::alignTabs() { | |||
353 | tabx = x() - xOffset(); | 353 | tabx = x() - xOffset(); |
354 | taby = y(); | 354 | taby = y(); |
355 | break; | 355 | break; |
356 | case LEFT: | 356 | case LEFTCENTER: |
357 | if (orig_orient != FbTk::ROT270) m_tab_container.hide(); | 357 | if (orig_orient != FbTk::ROT270) m_tab_container.hide(); |
358 | m_tab_container.setOrientation(FbTk::ROT270); | 358 | m_tab_container.setOrientation(FbTk::ROT270); |
359 | m_tab_container.setAlignment(FbTk::Container::CENTER); | 359 | m_tab_container.setAlignment(FbTk::Container::CENTER); |
@@ -377,7 +377,7 @@ void FbWinFrame::alignTabs() { | |||
377 | tabx = x() + width() + m_window.borderWidth(); | 377 | tabx = x() + width() + m_window.borderWidth(); |
378 | taby = y(); | 378 | taby = y(); |
379 | break; | 379 | break; |
380 | case RIGHT: | 380 | case RIGHTCENTER: |
381 | if (orig_orient != FbTk::ROT90) m_tab_container.hide(); | 381 | if (orig_orient != FbTk::ROT90) m_tab_container.hide(); |
382 | m_tab_container.setOrientation(FbTk::ROT90); | 382 | m_tab_container.setOrientation(FbTk::ROT90); |
383 | m_tab_container.setAlignment(FbTk::Container::CENTER); | 383 | m_tab_container.setAlignment(FbTk::Container::CENTER); |
@@ -401,7 +401,7 @@ void FbWinFrame::alignTabs() { | |||
401 | tabx = x(); | 401 | tabx = x(); |
402 | taby = y() + height() + m_window.borderWidth(); | 402 | taby = y() + height() + m_window.borderWidth(); |
403 | break; | 403 | break; |
404 | case BOTTOM: | 404 | case BOTTOMCENTER: |
405 | if (orig_orient != FbTk::ROT0) m_tab_container.hide(); | 405 | if (orig_orient != FbTk::ROT0) m_tab_container.hide(); |
406 | m_tab_container.setOrientation(FbTk::ROT0); | 406 | m_tab_container.setOrientation(FbTk::ROT0); |
407 | m_tab_container.setAlignment(FbTk::Container::CENTER); | 407 | m_tab_container.setAlignment(FbTk::Container::CENTER); |
@@ -912,10 +912,10 @@ void FbWinFrame::reconfigure() { | |||
912 | unsigned int neww, newh; | 912 | unsigned int neww, newh; |
913 | switch (*m_screen.getTabPlacementResource()) { | 913 | switch (*m_screen.getTabPlacementResource()) { |
914 | case TOPLEFT: | 914 | case TOPLEFT: |
915 | case TOP: | 915 | case TOPCENTER: |
916 | case TOPRIGHT: | 916 | case TOPRIGHT: |
917 | case BOTTOMLEFT: | 917 | case BOTTOMLEFT: |
918 | case BOTTOM: | 918 | case BOTTOMCENTER: |
919 | case BOTTOMRIGHT: | 919 | case BOTTOMRIGHT: |
920 | neww = m_tab_container.width(); | 920 | neww = m_tab_container.width(); |
921 | newh = buttonHeight(); | 921 | newh = buttonHeight(); |
@@ -1643,8 +1643,8 @@ int FbWinFrame::widthOffset() const { | |||
1643 | switch (*m_screen.getTabPlacementResource()) { | 1643 | switch (*m_screen.getTabPlacementResource()) { |
1644 | case LEFTTOP: | 1644 | case LEFTTOP: |
1645 | case RIGHTTOP: | 1645 | case RIGHTTOP: |
1646 | case LEFT: | 1646 | case LEFTCENTER: |
1647 | case RIGHT: | 1647 | case RIGHTCENTER: |
1648 | case LEFTBOTTOM: | 1648 | case LEFTBOTTOM: |
1649 | case RIGHTBOTTOM: | 1649 | case RIGHTBOTTOM: |
1650 | return m_tab_container.width() + m_window.borderWidth(); | 1650 | return m_tab_container.width() + m_window.borderWidth(); |
@@ -1661,10 +1661,10 @@ int FbWinFrame::heightOffset() const { | |||
1661 | 1661 | ||
1662 | switch (*m_screen.getTabPlacementResource()) { | 1662 | switch (*m_screen.getTabPlacementResource()) { |
1663 | case TOPLEFT: | 1663 | case TOPLEFT: |
1664 | case TOP: | 1664 | case TOPCENTER: |
1665 | case TOPRIGHT: | 1665 | case TOPRIGHT: |
1666 | case BOTTOMLEFT: | 1666 | case BOTTOMLEFT: |
1667 | case BOTTOM: | 1667 | case BOTTOMCENTER: |
1668 | case BOTTOMRIGHT: | 1668 | case BOTTOMRIGHT: |
1669 | return m_tab_container.height() + m_window.borderWidth(); | 1669 | return m_tab_container.height() + m_window.borderWidth(); |
1670 | break; | 1670 | break; |
@@ -1680,7 +1680,7 @@ int FbWinFrame::xOffset() const { | |||
1680 | 1680 | ||
1681 | switch (*m_screen.getTabPlacementResource()) { | 1681 | switch (*m_screen.getTabPlacementResource()) { |
1682 | case LEFTTOP: | 1682 | case LEFTTOP: |
1683 | case LEFT: | 1683 | case LEFTCENTER: |
1684 | case LEFTBOTTOM: | 1684 | case LEFTBOTTOM: |
1685 | return m_tab_container.width() + m_window.borderWidth(); | 1685 | return m_tab_container.width() + m_window.borderWidth(); |
1686 | break; | 1686 | break; |
@@ -1696,7 +1696,7 @@ int FbWinFrame::yOffset() const { | |||
1696 | 1696 | ||
1697 | switch (*m_screen.getTabPlacementResource()) { | 1697 | switch (*m_screen.getTabPlacementResource()) { |
1698 | case TOPLEFT: | 1698 | case TOPLEFT: |
1699 | case TOP: | 1699 | case TOPCENTER: |
1700 | case TOPRIGHT: | 1700 | case TOPRIGHT: |
1701 | return m_tab_container.height() + m_window.borderWidth(); | 1701 | return m_tab_container.height() + m_window.borderWidth(); |
1702 | break; | 1702 | break; |