diff options
-rw-r--r-- | src/WorkspaceCmd.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc index 946f84b..9715ff9 100644 --- a/src/WorkspaceCmd.cc +++ b/src/WorkspaceCmd.cc | |||
@@ -20,7 +20,7 @@ | |||
20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 20 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
21 | // DEALINGS IN THE SOFTWARE. | 21 | // DEALINGS IN THE SOFTWARE. |
22 | 22 | ||
23 | // $Id: WorkspaceCmd.cc,v 1.11 2004/04/28 14:59:12 rathnor Exp $ | 23 | // $Id: WorkspaceCmd.cc,v 1.12 2004/08/10 12:08:31 fluxgen Exp $ |
24 | 24 | ||
25 | #include "WorkspaceCmd.hh" | 25 | #include "WorkspaceCmd.hh" |
26 | 26 | ||
@@ -50,7 +50,8 @@ void NextWindowCmd::execute() { | |||
50 | else { | 50 | else { |
51 | // if stacked cycling, then set a watch for | 51 | // if stacked cycling, then set a watch for |
52 | // the release of exactly these modifiers | 52 | // the release of exactly these modifiers |
53 | if (!fb->watchingScreen() && !(m_option & BScreen::CYCLELINEAR)) | 53 | if (!fb->watchingScreen() && |
54 | !(m_option & BScreen::CYCLELINEAR)) | ||
54 | Fluxbox::instance()->watchKeyRelease(*screen, mods); | 55 | Fluxbox::instance()->watchKeyRelease(*screen, mods); |
55 | screen->nextFocus(m_option); | 56 | screen->nextFocus(m_option); |
56 | } | 57 | } |
@@ -71,7 +72,8 @@ void PrevWindowCmd::execute() { | |||
71 | else { | 72 | else { |
72 | // if stacked cycling, then set a watch for | 73 | // if stacked cycling, then set a watch for |
73 | // the release of exactly these modifiers | 74 | // the release of exactly these modifiers |
74 | if (!fb->watchingScreen() && !(m_option & BScreen::CYCLELINEAR)) | 75 | if (!fb->watchingScreen() |
76 | && !(m_option & BScreen::CYCLELINEAR)) | ||
75 | Fluxbox::instance()->watchKeyRelease(*screen, mods); | 77 | Fluxbox::instance()->watchKeyRelease(*screen, mods); |
76 | screen->prevFocus(m_option); | 78 | screen->prevFocus(m_option); |
77 | } | 79 | } |
@@ -141,7 +143,7 @@ void ArrangeWindowsCmd::execute() { | |||
141 | const unsigned int max_heigth = screen->maxBottom(head) - screen->maxTop(head); | 143 | const unsigned int max_heigth = screen->maxBottom(head) - screen->maxTop(head); |
142 | 144 | ||
143 | // try to get the same number of rows as columns. | 145 | // try to get the same number of rows as columns. |
144 | unsigned int rows = int(sqrt(win_count)); // truncate to lower | 146 | unsigned int rows = int(sqrt((float)win_count)); // truncate to lower |
145 | unsigned int cols = int(0.99 + float(win_count) / float(rows)); | 147 | unsigned int cols = int(0.99 + float(win_count) / float(rows)); |
146 | if (max_width<max_heigth) { // rotate | 148 | if (max_width<max_heigth) { // rotate |
147 | unsigned int tmp; | 149 | unsigned int tmp; |