From: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Date: Wed, 8 Oct 2014 02:49:30 +0000 (+1100)
Subject: ui/ncurses: Properly size cancel and help buttons
X-Git-Tag: v1.0.0~98
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=0303df2c1d860cb0384b1d1c30729561ac2f2117

ui/ncurses: Properly size cancel and help buttons

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
---

diff --git a/ui/ncurses/nc-add-url.c b/ui/ncurses/nc-add-url.c
index c0f08f2..386d813 100644
--- a/ui/ncurses/nc-add-url.c
+++ b/ui/ncurses/nc-add-url.c
@@ -191,7 +191,7 @@ static void add_url_screen_layout_widgets(struct add_url_screen *screen)
 	widget_move(widget_button_base(screen->widgets.help_b),
 		y, screen->field_x + 10);
 	widget_move(widget_button_base(screen->widgets.cancel_b),
-		y, screen->field_x + 23);
+		y, screen->field_x + 24);
 }
 
 static void add_url_screen_setup_widgets(struct add_url_screen *screen)
@@ -207,9 +207,9 @@ static void add_url_screen_setup_widgets(struct add_url_screen *screen)
 
 	screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, _("OK"),
 			ok_click, screen);
-	screen->widgets.help_b = widget_new_button(set, 0, 0, 9, _("Help"),
+	screen->widgets.help_b = widget_new_button(set, 0, 0, 10, _("Help"),
 			help_click, screen);
-	screen->widgets.cancel_b = widget_new_button(set, 0, 0, 9, _("Cancel"),
+	screen->widgets.cancel_b = widget_new_button(set, 0, 0, 10, _("Cancel"),
 			cancel_click, screen);
 }
 
diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c
index d1918a7..551b9d2 100644
--- a/ui/ncurses/nc-config.c
+++ b/ui/ncurses/nc-config.c
@@ -483,7 +483,7 @@ static void config_screen_layout_widgets(struct config_screen *screen)
 	widget_move(widget_button_base(screen->widgets.help_b),
 			y, screen->field_x + 10);
 	widget_move(widget_button_base(screen->widgets.cancel_b),
-			y, screen->field_x + 23);
+			y, screen->field_x + 24);
 }
 
 static void config_screen_network_change(void *arg, int value)
@@ -744,9 +744,9 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 
 	screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, _("OK"),
 			ok_click, screen);
-	screen->widgets.help_b = widget_new_button(set, 0, 0, 9, _("Help"),
+	screen->widgets.help_b = widget_new_button(set, 0, 0, 10, _("Help"),
 			help_click, screen);
-	screen->widgets.cancel_b = widget_new_button(set, 0, 0, 9, _("Cancel"),
+	screen->widgets.cancel_b = widget_new_button(set, 0, 0, 10, _("Cancel"),
 			cancel_click, screen);
 }
 
diff --git a/ui/ncurses/nc-lang.c b/ui/ncurses/nc-lang.c
index 0da7b9d..0422ebb 100644
--- a/ui/ncurses/nc-lang.c
+++ b/ui/ncurses/nc-lang.c
@@ -289,7 +289,7 @@ static void lang_screen_setup_widgets(struct lang_screen *screen,
 
 	screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, _("OK"),
 			ok_click, screen);
-	screen->widgets.cancel_b = widget_new_button(set, 0, 0, 9, _("Cancel"),
+	screen->widgets.cancel_b = widget_new_button(set, 0, 0, 10, _("Cancel"),
 			cancel_click, screen);
 }