Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOMobile-Cn-Ko-En
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fallenstardust
YGOMobile-Cn-Ko-En
Commits
513351e2
Commit
513351e2
authored
Jun 28, 2020
by
mercury233
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix button img size
parent
7a686150
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
+3
-6
Classes/gframe/deck_con.cpp
Classes/gframe/deck_con.cpp
+0
-1
Classes/gframe/event_handler.cpp
Classes/gframe/event_handler.cpp
+0
-2
Classes/gframe/game.cpp
Classes/gframe/game.cpp
+3
-3
No files found.
Classes/gframe/deck_con.cpp
View file @
513351e2
...
@@ -356,7 +356,6 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
...
@@ -356,7 +356,6 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
mainGame
->
gameConf
.
enable_music
=
true
;
mainGame
->
gameConf
.
enable_music
=
true
;
mainGame
->
imgVol
->
setImage
(
imageManager
.
tPlay
);
mainGame
->
imgVol
->
setImage
(
imageManager
.
tPlay
);
}
}
mainGame
->
imgVol
->
setImageSize
(
core
::
dimension2di
(
mainGame
->
yScale
,
mainGame
->
yScale
));
mainGame
->
chkEnableMusic
->
setChecked
(
mainGame
->
gameConf
.
enable_music
);
mainGame
->
chkEnableMusic
->
setChecked
(
mainGame
->
gameConf
.
enable_music
);
mainGame
->
soundManager
->
EnableMusic
(
mainGame
->
chkEnableMusic
->
isChecked
());
mainGame
->
soundManager
->
EnableMusic
(
mainGame
->
chkEnableMusic
->
isChecked
());
break
;
break
;
...
...
Classes/gframe/event_handler.cpp
View file @
513351e2
...
@@ -205,7 +205,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
...
@@ -205,7 +205,6 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
mainGame
->
gameConf
.
enable_music
=
true
;
mainGame
->
gameConf
.
enable_music
=
true
;
mainGame
->
imgVol
->
setImage
(
imageManager
.
tPlay
);
mainGame
->
imgVol
->
setImage
(
imageManager
.
tPlay
);
}
}
mainGame
->
imgVol
->
setImageSize
(
core
::
dimension2di
(
mainGame
->
yScale
,
mainGame
->
yScale
));
mainGame
->
chkEnableMusic
->
setChecked
(
mainGame
->
gameConf
.
enable_music
);
mainGame
->
chkEnableMusic
->
setChecked
(
mainGame
->
gameConf
.
enable_music
);
mainGame
->
soundManager
->
EnableMusic
(
mainGame
->
chkEnableMusic
->
isChecked
());
mainGame
->
soundManager
->
EnableMusic
(
mainGame
->
chkEnableMusic
->
isChecked
());
break
;
break
;
...
@@ -1911,7 +1910,6 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
...
@@ -1911,7 +1910,6 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
}
else
{
}
else
{
mainGame
->
imgVol
->
setImage
(
imageManager
.
tMute
);
mainGame
->
imgVol
->
setImage
(
imageManager
.
tMute
);
}
}
mainGame
->
imgVol
->
setImageSize
(
core
::
dimension2di
(
mainGame
->
yScale
,
mainGame
->
yScale
));
return
true
;
return
true
;
break
;
break
;
}
}
...
...
Classes/gframe/game.cpp
View file @
513351e2
...
@@ -397,8 +397,8 @@ bool Game::Initialize() {
...
@@ -397,8 +397,8 @@ bool Game::Initialize() {
wPallet
->
setVisible
(
false
);
wPallet
->
setVisible
(
false
);
//Logs
//Logs
imgLog
=
irr
::
gui
::
CGUIImageButton
::
addImageButton
(
env
,
rect
<
s32
>
(
0
*
yScale
,
55
*
yScale
,
45
*
yScale
,
100
*
yScale
),
wPallet
,
BUTTON_SHOW_LOG
);
imgLog
=
irr
::
gui
::
CGUIImageButton
::
addImageButton
(
env
,
rect
<
s32
>
(
0
*
yScale
,
55
*
yScale
,
45
*
yScale
,
100
*
yScale
),
wPallet
,
BUTTON_SHOW_LOG
);
imgLog
->
setImageSize
(
core
::
dimension2di
(
28
*
yScale
,
28
*
yScale
));
imgLog
->
setImage
(
imageManager
.
tLogs
);
imgLog
->
setImage
(
imageManager
.
tLogs
);
imgLog
->
setImageSize
(
core
::
dimension2di
(
yScale
,
yScale
));
imgLog
->
setIsPushButton
(
true
);
imgLog
->
setIsPushButton
(
true
);
wLogs
=
env
->
addWindow
(
rect
<
s32
>
(
720
*
xScale
,
5
*
yScale
,
1020
*
xScale
,
510
*
yScale
),
false
,
dataManager
.
GetSysString
(
1271
));
wLogs
=
env
->
addWindow
(
rect
<
s32
>
(
720
*
xScale
,
5
*
yScale
,
1020
*
xScale
,
510
*
yScale
),
false
,
dataManager
.
GetSysString
(
1271
));
wLogs
->
getCloseButton
()
->
setVisible
(
false
);
wLogs
->
getCloseButton
()
->
setVisible
(
false
);
...
@@ -409,16 +409,16 @@ bool Game::Initialize() {
...
@@ -409,16 +409,16 @@ bool Game::Initialize() {
btnCloseLog
=
env
->
addButton
(
rect
<
s32
>
(
170
*
xScale
,
460
*
yScale
,
240
*
xScale
,
500
*
yScale
),
wLogs
,
BUTTON_CLOSE_LOG
,
dataManager
.
GetSysString
(
1211
));
btnCloseLog
=
env
->
addButton
(
rect
<
s32
>
(
170
*
xScale
,
460
*
yScale
,
240
*
xScale
,
500
*
yScale
),
wLogs
,
BUTTON_CLOSE_LOG
,
dataManager
.
GetSysString
(
1211
));
//vol play/mute
//vol play/mute
imgVol
=
irr
::
gui
::
CGUIImageButton
::
addImageButton
(
env
,
rect
<
s32
>
(
0
*
yScale
,
110
*
yScale
,
45
*
yScale
,
155
*
yScale
),
wPallet
,
BUTTON_BGM
);
imgVol
=
irr
::
gui
::
CGUIImageButton
::
addImageButton
(
env
,
rect
<
s32
>
(
0
*
yScale
,
110
*
yScale
,
45
*
yScale
,
155
*
yScale
),
wPallet
,
BUTTON_BGM
);
imgVol
->
setImageSize
(
core
::
dimension2di
(
28
*
yScale
,
28
*
yScale
));
if
(
gameConf
.
enable_music
)
{
if
(
gameConf
.
enable_music
)
{
imgVol
->
setImage
(
imageManager
.
tPlay
);
imgVol
->
setImage
(
imageManager
.
tPlay
);
}
else
{
}
else
{
imgVol
->
setImage
(
imageManager
.
tMute
);
imgVol
->
setImage
(
imageManager
.
tMute
);
}
}
imgVol
->
setImageSize
(
core
::
dimension2di
(
yScale
,
yScale
));
//Settings
//Settings
imgSettings
=
irr
::
gui
::
CGUIImageButton
::
addImageButton
(
env
,
rect
<
s32
>
(
0
*
yScale
,
0
*
yScale
,
45
*
yScale
,
45
*
yScale
),
wPallet
,
BUTTON_SETTINGS
);
imgSettings
=
irr
::
gui
::
CGUIImageButton
::
addImageButton
(
env
,
rect
<
s32
>
(
0
*
yScale
,
0
*
yScale
,
45
*
yScale
,
45
*
yScale
),
wPallet
,
BUTTON_SETTINGS
);
imgSettings
->
setImageSize
(
core
::
dimension2di
(
28
*
yScale
,
28
*
yScale
));
imgSettings
->
setImage
(
imageManager
.
tSettings
);
imgSettings
->
setImage
(
imageManager
.
tSettings
);
imgSettings
->
setImageSize
(
core
::
dimension2di
(
yScale
,
yScale
));
imgSettings
->
setIsPushButton
(
true
);
imgSettings
->
setIsPushButton
(
true
);
wSettings
=
env
->
addWindow
(
rect
<
s32
>
(
350
*
xScale
,
100
*
yScale
,
830
*
xScale
,
550
*
yScale
),
false
,
dataManager
.
GetSysString
(
1273
));
wSettings
=
env
->
addWindow
(
rect
<
s32
>
(
350
*
xScale
,
100
*
yScale
,
830
*
xScale
,
550
*
yScale
),
false
,
dataManager
.
GetSysString
(
1273
));
wSettings
->
setRelativePosition
(
recti
(
350
*
xScale
,
100
*
yScale
,
830
*
xScale
,
550
*
yScale
));
wSettings
->
setRelativePosition
(
recti
(
350
*
xScale
,
100
*
yScale
,
830
*
xScale
,
550
*
yScale
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment