widelands-dev team mailing list archive

[Angelo Locritani <angelo.locritani@xxxxxxxxx>]

Angelo Locritani has proposed merging lp:~alocritani/widelands/switch_-+_position_editor into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~alocritani/widelands/switch_-+_position_editor/+merge/99991

switched other +/- buttons in editor windows.

Of couse not for build17, 'cause of Feature Freeze
-- 
https://code.launchpad.net/~alocritani/widelands/switch_-+_position_editor/+merge/99991
Your team Widelands Developers is requested to review the proposed merge of lp:~alocritani/widelands/switch_-+_position_editor into lp:widelands.

=== modified file 'src/editor/ui_menus/editor_main_menu_new_map.cc'
--- src/editor/ui_menus/editor_main_menu_new_map.cc	2012-02-15 21:25:34 +0000
+++ src/editor/ui_menus/editor_main_menu_new_map.cc	2012-03-29 18:11:53 +0000
@@ -67,14 +67,14 @@
 
 	UI::Button * widthupbtn = new UI::Button
 		(this, "width_up",
-		 posx, posy, 20, 20,
+		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
 	widthupbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 0));
 
 	UI::Button * widthdownbtn = new UI::Button
 		(this, "width_down",
-		 get_inner_w() - spacing - 20, posy, 20, 20,
+		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
 	widthdownbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 1));
@@ -88,14 +88,14 @@
 
 	UI::Button * heightupbtn = new UI::Button
 		(this, "height_up",
-		 posx, posy, 20, 20,
+		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
 	heightupbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 2));
 
 	UI::Button * heightdownbtn = new UI::Button
 		(this, "height_down",
-		 get_inner_w() - spacing - 20, posy, 20, 20,
+		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
 	heightdownbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 3));

=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.cc'
--- src/editor/ui_menus/editor_main_menu_random_map.cc	2012-02-15 21:25:34 +0000
+++ src/editor/ui_menus/editor_main_menu_random_map.cc	2012-03-29 18:11:53 +0000
@@ -100,7 +100,7 @@
 
 	UI::Button * widthupbtn = new UI::Button
 		(this, "width_up",
-		 posx, posy, 20, 20,
+		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
 	widthupbtn->sigclicked.connect
@@ -108,7 +108,7 @@
 
 	UI::Button * widthdownbtn = new UI::Button
 		(this, "width_down",
-		 get_inner_w() - spacing - 20, posy, 20, 20,
+		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
 	widthdownbtn->sigclicked.connect
@@ -130,7 +130,7 @@
 
 	UI::Button * heightupbtn = new UI::Button
 		(this, "height_up",
-		 posx, posy, 20, 20,
+		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
 	heightupbtn->sigclicked.connect
@@ -138,7 +138,7 @@
 
 	UI::Button * heightdownbtn = new UI::Button
 		(this, "height_down",
-		 get_inner_w() - spacing - 20, posy, 20, 20,
+		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
 	heightdownbtn->sigclicked.connect
@@ -151,7 +151,7 @@
 
 	UI::Button * waterupbtn = new UI::Button
 		(this, "water_up",
-		 posx, posy, 20, 20,
+		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
 	waterupbtn->sigclicked.connect
@@ -159,7 +159,7 @@
 
 	UI::Button * waterdownbtn = new UI::Button
 		(this, "water_down",
-		 get_inner_w() - spacing - 20, posy, 20, 20,
+		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
 	waterdownbtn->sigclicked.connect
@@ -176,7 +176,7 @@
 
 	UI::Button * landupbtn = new UI::Button
 		(this, "land_up",
-		 posx, posy, 20, 20,
+		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
 	landupbtn->sigclicked.connect
@@ -184,7 +184,7 @@
 
 	UI::Button * landdownbtn = new UI::Button
 		(this, "land_down",
-		 get_inner_w() - spacing - 20, posy, 20, 20,
+		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
 	landdownbtn->sigclicked.connect
@@ -202,7 +202,7 @@
 
 	UI::Button * wastelandupbtn = new UI::Button
 		(this, "wasteland_up",
-		 posx, posy, 20, 20,
+		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
 	wastelandupbtn->sigclicked.connect
@@ -210,7 +210,7 @@
 
 	UI::Button * wastelanddownbtn = new UI::Button
 		(this, "wasteland_down",
-		 get_inner_w() - spacing - 20, posy, 20, 20,
+		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
 	wastelanddownbtn->sigclicked.connect
@@ -312,7 +312,7 @@
 
 	UI::Button * playerupbtn = new UI::Button
 		(this, "player_up",
-		 posx, posy, 20, 20,
+		 get_inner_w() - spacing - 20, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_up.png"));
 	playerupbtn->sigclicked.connect
@@ -320,7 +320,7 @@
 
 	UI::Button * playerdownbtn = new UI::Button
 		(this, "player_down",
-		 get_inner_w() - spacing - 20, posy, 20, 20,
+		 posx, posy, 20, 20,
 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
 		 g_gr->get_picture(PicMod_UI, "pics/scrollbar_down.png"));
 	playerdownbtn->sigclicked.connect