Fix:gui_internal:Cleaned up scroll buttons a bit

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@5526 ffa7fe5e-494d-0410-b361-a75ebd5db220

2 files changed, 9 insertions, 17 deletions

diff --git a/navit/navit/gui/internal/gui_internal.h b/navit/navit/gui/internal/gui_internal.h
index 93863c6ac..f9f31f1a4 100644
--- a/navit/navit/gui/internal/gui_internal.h
+++ b/navit/navit/gui/internal/gui_internal.h
@@ -41,6 +41,7 @@ enum flags {
 	gravity_right_bottom=gravity_right|gravity_bottom,
 	flags_expand=0x100,
 	flags_fill=0x200,
+	flags_swap=0x400,
 	orientation_horizontal=0x10000,
 	orientation_vertical=0x20000,
 	orientation_horizontal_vertical=0x40000,
diff --git a/navit/navit/gui/internal/gui_internal_widget.c b/navit/navit/gui/internal/gui_internal_widget.c
index 9a0afbc8a..100005fde 100644
--- a/navit/navit/gui/internal/gui_internal_widget.c
+++ b/navit/navit/gui/internal/gui_internal_widget.c
@@ -169,10 +169,12 @@ gui_internal_button_font_new_with_callback(struct gui_priv *this, const char *te
 	struct widget *ret=NULL;
 	ret=gui_internal_box_new(this, flags);
 	if (ret) {
-		if (image)
+		if (image && !(flags & flags_swap))
 			gui_internal_widget_append(ret, gui_internal_image_new(this, image));
 		if (text)
 			gui_internal_widget_append(ret, gui_internal_text_font_new(this, text, font, gravity_center|orientation_vertical));
+		if (image && (flags & flags_swap))
+			gui_internal_widget_append(ret, gui_internal_image_new(this, image));
 		ret->func=func;
 		ret->data=data;
 		if (func) {
@@ -776,25 +778,14 @@ struct widget * gui_internal_widget_table_new(struct gui_priv * this, enum flags
 	data = (struct table_data*)widget->data;
 
 	if (buttons) {
-		data->next_button=gui_internal_box_new(this, gravity_center|orientation_horizontal);
-		gui_internal_widget_append(data->next_button, gui_internal_text_new(this,_("Next"),gravity_center|orientation_horizontal));
-		gui_internal_widget_append(data->next_button, gui_internal_image_new(this, image_new_xs(this, "gui_arrow_right")));
-		data->next_button->func=gui_internal_table_button_next;
-		data->next_button->data=widget;
-
-
-		data->prev_button =  gui_internal_button_new_with_callback
-			(this, _("Prev"),
-			image_new_xs(this, "gui_arrow_left"),
-		 	gravity_center |orientation_horizontal,
-		 	gui_internal_table_button_prev,NULL);
-
-		data->prev_button->data=widget;
+		data->next_button =  gui_internal_button_new_with_callback(this, _("Next"), image_new_xs(this, "gui_arrow_right"),
+		 	gravity_center|orientation_horizontal|flags_swap, gui_internal_table_button_next, widget);
+		data->prev_button =  gui_internal_button_new_with_callback(this, _("Prev"), image_new_xs(this, "gui_arrow_left"),
+		 	gravity_center|orientation_horizontal, gui_internal_table_button_prev, widget);
 
 		data->this=this;
 
-		data->button_box=gui_internal_box_new(this,
-					      gravity_center|orientation_horizontal);
+		data->button_box=gui_internal_box_new(this, gravity_center|orientation_horizontal);
 		gui_internal_widget_append(widget, data->button_box);
 		gui_internal_widget_append(data->button_box, data->prev_button);
 		gui_internal_widget_append(data->button_box, data->next_button);