Skip to content

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

fixmerge

parent 3da6f3a0
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 6 deletions
gframe/game.cpp
View file @ 5cbce064
...@@ -1944,13 +1944,9 @@ void Game::OnResize() { ...@@ -1944,13 +1944,9 @@ void Game::OnResize() {
stHintMsg->setRelativePosition(ResizeWin(500, 60, 820, 90)); stHintMsg->setRelativePosition(ResizeWin(500, 60, 820, 90));
//sound / music volume bar //sound / music volume bar
<<<<<<< HEAD
scrSoundVolume->setRelativePosition(recti(20 + 126, 230 + 4, 20 + (300 * xScale) - 40, 230 + 21));
scrMusicVolume->setRelativePosition(recti(20 + 126, 260 + 4, 20 + (300 * xScale) - 40, 260 + 21));
cbLocale->setRelativePosition(recti(20 + 160, 350 + 4, 20 + (300 * xScale) - 40, 350 + 21));
=======
//scrSoundVolume->setRelativePosition(recti(20 + 126, 230 + 4, 20 + (300 * xScale) - 40, 230 + 21)); //scrSoundVolume->setRelativePosition(recti(20 + 126, 230 + 4, 20 + (300 * xScale) - 40, 230 + 21));
//scrMusicVolume->setRelativePosition(recti(20 + 126, 260 + 4, 20 + (300 * xScale) - 40, 260 + 21)); //scrMusicVolume->setRelativePosition(recti(20 + 126, 260 + 4, 20 + (300 * xScale) - 40, 260 + 21));
//cbLocale->setRelativePosition(recti(20 + 160, 350 + 4, 20 + (300 * xScale) - 40, 350 + 21));
recti tabHelperPos = recti(0, 0, 300 * xScale - 50, 365 * yScale - 65); recti tabHelperPos = recti(0, 0, 300 * xScale - 50, 365 * yScale - 65);
tabHelper->setRelativePosition(tabHelperPos); tabHelper->setRelativePosition(tabHelperPos);
...@@ -1972,7 +1968,6 @@ void Game::OnResize() { ...@@ -1972,7 +1968,6 @@ void Game::OnResize() {
scrTabSystem->setVisible(true); scrTabSystem->setVisible(true);
} else } else
scrTabSystem->setVisible(false); scrTabSystem->setVisible(false);
>>>>>>> 3c8884ade09d573630336c08e3a1ac83340e96a1
if(gameConf.resize_popup_menu) { if(gameConf.resize_popup_menu) {
int width = 100 * mainGame->xScale; int width = 100 * mainGame->xScale;
......
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