diff options
author | fluxgen <fluxgen> | 2002-04-08 18:57:04 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-04-08 18:57:04 (GMT) |
commit | f234dd3db110b3315c51dfc27a1cf8ed2c51beea (patch) | |
tree | 6ba37313ba0a9beaa1992ad89c1eea3f5c9f23e1 | |
parent | d4f4767c969de19bb95407400351508fa3785f47 (diff) | |
download | fluxbox_paul-f234dd3db110b3315c51dfc27a1cf8ed2c51beea.zip fluxbox_paul-f234dd3db110b3315c51dfc27a1cf8ed2c51beea.tar.bz2 |
fixed signed/unsigned in Xinerama stuff
-rw-r--r-- | src/Basemenu.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Basemenu.cc b/src/Basemenu.cc index 79e53e5..d5cf707 100644 --- a/src/Basemenu.cc +++ b/src/Basemenu.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Basemenu.cc,v 1.18 2002/04/04 11:28:19 fluxgen Exp $ | 25 | // $Id: Basemenu.cc,v 1.19 2002/04/08 18:57:04 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -577,7 +577,7 @@ void Basemenu::drawSubmenu(unsigned int index) { | |||
577 | head_h = screen->getHeight(); | 577 | head_h = screen->getHeight(); |
578 | } | 578 | } |
579 | 579 | ||
580 | if ((x + item->submenu()->getWidth()) > (head_x + head_w)) { | 580 | if (static_cast<int>(x + item->submenu()->getWidth()) > static_cast<int>(head_x + head_w)) { |
581 | x = ((shifted) ? menu.x_shift : menu.x) - | 581 | x = ((shifted) ? menu.x_shift : menu.x) - |
582 | item->submenu()->getWidth() - screen->getBorderWidth(); | 582 | item->submenu()->getWidth() - screen->getBorderWidth(); |
583 | } | 583 | } |
@@ -585,7 +585,7 @@ void Basemenu::drawSubmenu(unsigned int index) { | |||
585 | if (x < head_x) | 585 | if (x < head_x) |
586 | x = head_x; | 586 | x = head_x; |
587 | 587 | ||
588 | if ((y + item->submenu()->getHeight()) > (head_y + head_h)) { | 588 | if (static_cast<int>(y + item->submenu()->getHeight()) > static_cast<int>(head_y + head_h)) { |
589 | y = head_y + head_h - | 589 | y = head_y + head_h - |
590 | item->submenu()->getHeight() - screen->getBorderWidth2x(); | 590 | item->submenu()->getHeight() - screen->getBorderWidth2x(); |
591 | } | 591 | } |