summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2008-07-01 17:45:16 +0000
committerJens Arnold <amiconn@rockbox.org>2008-07-01 17:45:16 +0000
commit4dab6235cf208181e456a1f24542e8d972f69173 (patch)
treece1d012717dbb9e60f37a9875db9b721533da099
parent98bdff1e014f589054fccff0a5f762bb1900e4ef (diff)
downloadrockbox-4dab6235cf208181e456a1f24542e8d972f69173.tar.gz
rockbox-4dab6235cf208181e456a1f24542e8d972f69173.zip
The second part of this expression always becomes true before the first part, so the first part is unnecessary.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17907 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/quickscreen.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index f19f2a1df6..4e55dfed7d 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -107,8 +107,7 @@ static void quickscreen_fix_viewports(struct gui_quickscreen *qs,
107 vp_icons[screen].height = 107 vp_icons[screen].height =
108 vps[screen][QUICKSCREEN_BOTTOM].y - vp_icons[screen].y; 108 vps[screen][QUICKSCREEN_BOTTOM].y - vp_icons[screen].y;
109 109
110 if ((left_width + right_width > parent->width - CENTER_ICONAREA_WIDTH) || 110 if (MAX(left_width, right_width)*2 > parent->width - CENTER_ICONAREA_WIDTH)
111 (MAX(left_width, right_width)*2 > parent->width - CENTER_ICONAREA_WIDTH))
112 { 111 {
113 /* scrolling needed */ 112 /* scrolling needed */
114 int center = (parent->width - CENTER_ICONAREA_WIDTH)/2; 113 int center = (parent->width - CENTER_ICONAREA_WIDTH)/2;