Merge lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

[GunChleoc]

Shifted chat overlay up so it won't overlap with the menu buttons.

See commit message - it's a problem at 800x600 resolution.

[Miroslav Remák (miroslavr256)]

Change the height here as well, so it doesn't shift back down on resolution change:

 graphic_resolution_changed_subscriber_ = Notifications::subscribe<GraphicResolutionChanged>(
    [this](const GraphicResolutionChanged& message) {
     set_size(message.width, message.height);

     chat_overlay_->set_size(get_w() / 2, get_h() - 25);
     chat_overlay_->recompute();
     adjust_toolbar_position();
  });

review: Needs Fixing

[Miroslav Remák (miroslavr256)]

LGTM.

review: Approve

[GunChleoc (gunchleoc)]

I decided to refactor this into a function. What do you think?

review: Needs Resubmitting

[Miroslav Remák (miroslavr256)]

Fine with me. Could you also fix the inconsistent indentation of that lambda?

[Miroslav Remák (miroslavr256)]

The constructor would probably need prettifying as well.

[GunChleoc (gunchleoc)]

What would you suggest regarding the prettyfying?

Indents are a problem with my IDE - we will run clang-format over the codebase before branching Build 19 to fix these issues.

[Miroslav Remák (miroslavr256)]

I don't have any experience with automatic formatting tools besides auto-indent in my IDE. I was suggesting doing it manually for these few lines (the rest is OK), but it can be done later. I think you can go ahead and merge it as it is then.

[GunChleoc (gunchleoc)]

OK, thanks!

@bunnybot merge

=== modified file 'src/wui/interactive_base.cc'
--- src/wui/interactive_base.cc	2016-03-08 15:21:41 +0000
+++ src/wui/interactive_base.cc	2016-04-04 08:33:07 +0000
@@ -83,7 +83,7 @@
    : MapView(nullptr, 0, 0, g_gr->get_xres(), g_gr->get_yres(), *this),
      // Initialize chatoveraly before the toolbar so it is below
      show_workarea_preview_(global_s.get_bool("workareapreview", true)),
-     chat_overlay_(new ChatOverlay(this, 10, 25, get_w() / 2, get_h() - 25)),
+	  chat_overlay_(new ChatOverlay(this, 10, 25, get_w() / 2, get_h() - 25)),
      toolbar_(this, 0, 0, UI::Box::Horizontal),
      m(new InteractiveBaseInternals(new QuickNavigation(the_egbase, get_w(), get_h()))),
 	  field_overlay_manager_(new FieldOverlayManager()),
@@ -110,12 +110,12 @@
 						  g_gr->images().get("images/wui/overlays/workarea2.png"),
 						  g_gr->images().get("images/wui/overlays/workarea1.png")} {
 
+	resize_chat_overlay();
+
 	graphic_resolution_changed_subscriber_ = Notifications::subscribe<GraphicResolutionChanged>(
 	   [this](const GraphicResolutionChanged& message) {
 		   set_size(message.width, message.height);
-
-		   chat_overlay_->set_size(get_w() / 2, get_h() - 25);
-		   chat_overlay_->recompute();
+			resize_chat_overlay();
 		   adjust_toolbar_position();
 		});
 
@@ -725,6 +725,13 @@
 }
 
 
+// Repositions the chat overlay
+void InteractiveBase::resize_chat_overlay() {
+	// 34 is the button height of the bottom menu
+	chat_overlay_->set_size(get_w() / 2, get_h() - 25 - 34);
+	chat_overlay_->recompute();
+}
+
 
 /*
 ===============

=== modified file 'src/wui/interactive_base.h'
--- src/wui/interactive_base.h	2016-02-09 16:29:48 +0000
+++ src/wui/interactive_base.h	2016-04-04 08:33:07 +0000
@@ -171,6 +171,7 @@
 	UI::Box           toolbar_;
 
 private:
+	void resize_chat_overlay();
 	void roadb_add_overlay   ();
 	void roadb_remove_overlay();
 	void cmd_map_object(const std::vector<std::string> & args);