← Back to team overview

widelands-dev team mailing list archive

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

 

GunChleoc has proposed merging lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands.

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

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/chat-messages-overlap/+merge/290834

See commit message - it's a problem at 800x600 resolution.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands.
=== 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-03 18:57:57 +0000
@@ -83,7 +83,8 @@
    : 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)),
+	  // 34 is the button height of the bottom menu
+	  chat_overlay_(new ChatOverlay(this, 10, 25, get_w() / 2, get_h() - 25 - 34)),
      toolbar_(this, 0, 0, UI::Box::Horizontal),
      m(new InteractiveBaseInternals(new QuickNavigation(the_egbase, get_w(), get_h()))),
 	  field_overlay_manager_(new FieldOverlayManager()),


Follow ups