Skip to content

Y
ygopro
Commit ce25cbc4 authored by nanahira's avatar nanahira
Browse files
Options

fixmerge

parent 840db7e2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
gframe/game.cpp
View file @ ce25cbc4
......@@ -515,11 +515,7 @@ bool Game::Initialize() {
btnSideSort->setVisible(false);
btnSideReload = env->addButton(rect<s32>(440, 100, 500, 130), 0, BUTTON_SIDE_RELOAD, dataManager.GetSysString(1309));
btnSideReload->setVisible(false);
<<<<<<< HEAD
=======
btnRenameDeck = env->addButton(rect<s32>(170, 99, 220, 120), wDeckEdit, BUTTON_RENAME_DECK, dataManager.GetSysString(1362));
btnDeckCode = env->addButton(rect<s32>(225, 5, 290, 30), wDeckEdit, BUTTON_DECK_CODE, dataManager.GetSysString(1387));
>>>>>>> df2434cc... finish
//
scrFilter = env->addScrollBar(false, recti(999, 161, 1019, 629), 0, SCROLL_FILTER);
scrFilter->setLargeStep(10);
......@@ -1579,11 +1575,7 @@ void Game::OnResize() {
btnSideSort->setRelativePosition(Resize(375, 100, 435, 130));
btnSideReload->setRelativePosition(Resize(440, 100, 500, 130));
btnDeleteDeck->setRelativePosition(Resize(225, 95, 290, 120));
<<<<<<< HEAD
=======
btnRenameDeck->setRelativePosition(Resize(170, 99, 220, 120));
btnDeckCode->setRelativePosition(Resize(225, 5, 290, 30));
>>>>>>> df2434cc... finish
wLanWindow->setRelativePosition(ResizeWin(220, 100, 800, 520));
wCreateHost->setRelativePosition(ResizeWin(320, 100, 700, 520));
......
ocgcore @ e8544068
Subproject commit 3cbdbf5a970b3ac5d8dcf0c6550898c41f5274e0
Subproject commit e8544068c0ce285d9a2ba5b002cd544e7754444e
script @ 3b2030ee
Subproject commit 68a3de27cbd22e6cf74157feeaa2b8e5ee455636
Subproject commit 3b2030eeaff8558f81a8c635451b5be95ccacb33
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment