Merge branch 'resize' into test

07dd8204 · mercury233 · 4acfabac · 2f0937dc · 07dd8204
Commit 07dd8204 authored Mar 21, 2018 by mercury233
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

gframe/event_handler.cpp gframe/event_handler.cpp +1 -1

No files found.
--- a/gframe/event_handler.cpp
+++ b/gframe/event_handler.cpp
@@ -2045,7 +2045,7 @@ void ClientField::ShowMenu(int flag, int x, int y) {
 		return;
 	}
 	int height = 1;
-	int offset = (mainGame->gameConf.resize_popup_menu && mainGame->yScale >= 0.666) ? 21 * mainGame->yScale : 14;
+	int offset = mainGame->gameConf.resize_popup_menu ? ((mainGame->yScale >= 0.666) ? 21 * mainGame->yScale : 14) : 21;
 	if(flag & COMMAND_ACTIVATE) {
 		mainGame->btnActivate->setVisible(true);
 		mainGame->btnActivate->setRelativePosition(position2di(1, height));