revert

This revert 0a893.

revert
This revert 0a893.
259d3ca0 · salix5 · 98f9da0c · 259d3ca0 · 35927886 · 9da642fe
Commit 259d3ca0 authored Mar 19, 2016 by salix5
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/gframe/event_handler.cpp
+++ b/gframe/event_handler.cpp
@@ -1843,7 +1843,7 @@ void ClientField::ShowMenu(int flag, int x, int y) {
 	} else mainGame->btnShowList->setVisible(false);
 	panel = mainGame->wCmdMenu;
 	mainGame->wCmdMenu->setVisible(true);
-	mainGame->wCmdMenu->setRelativePosition(irr::core::recti(x - 20, y, x + 80, y + height));
+	mainGame->wCmdMenu->setRelativePosition(irr::core::recti(x - 20 , y - 20 - height, x + 80, y - 20));
 }

 void ClientField::SetResponseSelectedCards() const {

--- a/ocgcore @ 35927886
+++ b/ocgcore @ 35927886
-Subproject commit 68920d7142b4af9c65af5d3ee4673651727ec59e
+Subproject commit 35927886a1effa6c8a2eccaa1eff2eb84e8595b3
--- a/script @ 9da642fe
+++ b/script @ 9da642fe
-Subproject commit 7154552ca78d01b4cddd19ea3c7152e8d919c6eb
+Subproject commit 9da642fec10fcc0cf90041d5ded55db02a4b619c