[aseprite] 213/308: Do not overlap the menubar with a menubox

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit e843e7a9ba124b723e80b6d9ef219b6cfe11df63
Author: David Capello <davidcapello at gmail.com>
Date:   Sun Feb 7 14:41:43 2016 -0300

    Do not overlap the menubar with a menubox
---
 src/ui/menu.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/menu.cpp b/src/ui/menu.cpp
index bde9e36..99a2e18 100644
--- a/src/ui/menu.cpp
+++ b/src/ui/menu.cpp
@@ -1,5 +1,5 @@
 // Aseprite UI Library
-// Copyright (C) 2001-2013, 2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -739,7 +739,7 @@ bool MenuItem::onProcessMessage(Message* msg)
 
         if (inBar()) {
           pos.x = MID(0, bounds().x, ui::display_w()-pos.w);
-          pos.y = MID(0, bounds().y2(), ui::display_h()-pos.h);
+          pos.y = MAX(0, bounds().y2());
         }
         else {
           int x_left = old_pos.x - pos.w;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git