From 004c41e2efce86e4112f4e46c99add87a1b911d9 Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Fri, 15 Aug 2014 18:53:08 +0200
Subject: [PATCH] Simplify bottom bar button drawing in Selector

Put the drawButton calls left-to-right.
Avoid duplicate code.

The order was changed: "Select" is now always first, to be consistent
with other dialogs.
---
 src/selector.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/selector.cpp b/src/selector.cpp
index 2415362..af4d6bd 100644
--- a/src/selector.cpp
+++ b/src/selector.cpp
@@ -62,16 +62,15 @@ int Selector::exec(int startSelection) {
 	writeTitle(bg, link->getTitle());
 	writeSubTitle(bg, link->getDescription());
 
+	int x = 5;
+	x = gmenu2x->drawButton(bg, "accept", gmenu2x->tr["Select"], x);
 	if (link->getSelectorBrowser()) {
-		gmenu2x->drawButton(bg, "start", gmenu2x->tr["Exit"],
-		gmenu2x->drawButton(bg, "accept", gmenu2x->tr["Select"],
-		gmenu2x->drawButton(bg, "cancel", gmenu2x->tr["Up one folder"],
-		gmenu2x->drawButton(bg, "left", "", 5))));
+		x = gmenu2x->drawButton(bg, "left", "", x);
+		x = gmenu2x->drawButton(bg, "cancel", gmenu2x->tr["Up one folder"], x);
 	} else {
-		gmenu2x->drawButton(bg, "start", gmenu2x->tr["Exit"],
-		gmenu2x->drawButton(bg, "cancel", "",
-		gmenu2x->drawButton(bg, "accept", gmenu2x->tr["Select"], 5)));
+		x = gmenu2x->drawButton(bg, "cancel", "", x);
 	}
+	x = gmenu2x->drawButton(bg, "start", gmenu2x->tr["Exit"], x);
 
 	unsigned int top, height;
 	tie(top, height) = gmenu2x->getContentArea();