From 6188182b7daa689655cb052ca21e0d74fa3d4aa7 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 28 Jul 2012 23:50:03 +0200 Subject: [PATCH] neutrino: fix menu position for right or bottom aligned Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c6ff06736a3ae594c6372f002efcb704a9d95353 Author: Stefan Seyfried Date: 2012-07-28 (Sat, 28 Jul 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 1e366f987..7902f07f4 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -843,7 +843,7 @@ void CMenuWidget::calcSize() full_width = width+sb_width+SHADOW_OFFSET; full_height = height+RADIUS_LARGE-2+SHADOW_OFFSET; - setMenuPos(width - sb_width); + setMenuPos(full_width); } void CMenuWidget::paint() @@ -890,7 +890,7 @@ void CMenuWidget::setMenuPos(const int& menu_width) { case MENU_POS_CENTER: x = offx + scr_x + ((scr_w - mn_width ) >> 1 ); - y = offy + scr_y + ((scr_h - height) >> 1 ); + y = offy + scr_y + ((scr_h - full_height) >> 1 ); break; case MENU_POS_TOP_LEFT: @@ -900,17 +900,17 @@ void CMenuWidget::setMenuPos(const int& menu_width) case MENU_POS_TOP_RIGHT: y = offy + scr_y + 10; - x = offx + scr_x + scr_w - mn_width - 10; + x = /*offx +*/ scr_x + scr_w - mn_width - 10; break; case MENU_POS_BOTTOM_LEFT: - y = offy + scr_y + scr_h - height - 10; + y = /*offy +*/ scr_y + scr_h - full_height - 10; x = offx + scr_x + 10; break; case MENU_POS_BOTTOM_RIGHT: - y = offy + scr_y + scr_h - height - 10; - x = offx + scr_x + scr_w - mn_width - 10; + y = /*offy +*/ scr_y + scr_h - full_height - 10; + x = /*offx +*/ scr_x + scr_w - mn_width - 10; break; } }