Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro-2pick
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
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
MyCard
ygopro-2pick
Commits
1c0c47e9
Commit
1c0c47e9
authored
May 07, 2018
by
mercury233
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'resize' into test
parents
2a46e39f
fa1112b9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
41 additions
and
34 deletions
+41
-34
gframe/game.cpp
gframe/game.cpp
+41
-34
No files found.
gframe/game.cpp
View file @
1c0c47e9
...
...
@@ -74,7 +74,7 @@ bool Game::Initialize() {
adFont
=
irr
::
gui
::
CGUITTFont
::
createTTFont
(
env
,
gameConf
.
numfont
,
12
);
lpcFont
=
irr
::
gui
::
CGUITTFont
::
createTTFont
(
env
,
gameConf
.
numfont
,
48
);
guiFont
=
irr
::
gui
::
CGUITTFont
::
createTTFont
(
env
,
gameConf
.
textfont
,
gameConf
.
textfontsize
);
textFont
=
guiFont
;
textFont
=
irr
::
gui
::
CGUITTFont
::
createTTFont
(
env
,
gameConf
.
textfont
,
gameConf
.
textfontsize
)
;
smgr
=
device
->
getSceneManager
();
device
->
setWindowCaption
(
L"YGOPro"
);
device
->
setResizable
(
true
);
...
...
@@ -515,7 +515,7 @@ bool Game::Initialize() {
//filters
wFilter
=
env
->
addStaticText
(
L""
,
rect
<
s32
>
(
610
,
5
,
1020
,
130
),
true
,
false
,
0
,
-
1
,
true
);
wFilter
->
setVisible
(
false
);
stCategory
=
env
->
addStaticText
(
dataManager
.
GetSysString
(
1311
),
rect
<
s32
>
(
10
,
2
5
/
6
+
2
,
70
,
22
+
25
/
6
),
false
,
false
,
wFilter
);
stCategory
=
env
->
addStaticText
(
dataManager
.
GetSysString
(
1311
),
rect
<
s32
>
(
10
,
2
+
25
/
6
,
70
,
22
+
25
/
6
),
false
,
false
,
wFilter
);
cbCardType
=
env
->
addComboBox
(
rect
<
s32
>
(
60
,
25
/
6
,
120
,
20
+
25
/
6
),
wFilter
,
COMBOBOX_MAINTYPE
);
cbCardType
->
addItem
(
dataManager
.
GetSysString
(
1310
));
cbCardType
->
addItem
(
dataManager
.
GetSysString
(
1312
));
...
...
@@ -1273,7 +1273,7 @@ void Game::ShowCardInfo(int code, bool resize) {
sc
=
aptr
->
second
.
setcode
;
}
if
(
sc
)
{
offset
=
23
;
offset
=
23
*
yScale
;
myswprintf
(
formatBuffer
,
L"%ls%ls"
,
dataManager
.
GetSysString
(
1329
),
dataManager
.
FormatSetName
(
sc
));
stSetName
->
setText
(
formatBuffer
);
}
else
...
...
@@ -1314,15 +1314,15 @@ void Game::ShowCardInfo(int code, bool resize) {
wcscat
(
formatBuffer
,
scaleBuffer
);
}
stDataInfo
->
setText
(
formatBuffer
);
stSetName
->
setRelativePosition
(
rect
<
s32
>
(
15
,
83
,
296
*
xScale
,
106
));
stText
->
setRelativePosition
(
rect
<
s32
>
(
15
,
83
+
offset
,
287
*
xScale
,
324
*
yScale
));
stSetName
->
setRelativePosition
(
rect
<
s32
>
(
15
,
83
*
yScale
,
296
*
xScale
,
83
*
yScale
+
offset
));
stText
->
setRelativePosition
(
rect
<
s32
>
(
15
,
83
*
yScale
+
offset
,
287
*
xScale
,
324
*
yScale
));
scrCardText
->
setRelativePosition
(
rect
<
s32
>
(
287
*
xScale
-
20
,
83
+
offset
,
287
*
xScale
,
324
*
yScale
));
}
else
{
myswprintf
(
formatBuffer
,
L"[%ls]"
,
dataManager
.
FormatType
(
cd
.
type
));
stInfo
->
setText
(
formatBuffer
);
stDataInfo
->
setText
(
L""
);
stSetName
->
setRelativePosition
(
rect
<
s32
>
(
15
,
60
,
296
*
xScale
,
83
));
stText
->
setRelativePosition
(
rect
<
s32
>
(
15
,
60
+
offset
,
287
*
xScale
,
324
*
yScale
));
stSetName
->
setRelativePosition
(
rect
<
s32
>
(
15
,
60
*
yScale
,
296
*
xScale
,
60
*
yScale
+
offset
));
stText
->
setRelativePosition
(
rect
<
s32
>
(
15
,
60
*
yScale
+
offset
,
287
*
xScale
,
324
*
yScale
));
scrCardText
->
setRelativePosition
(
rect
<
s32
>
(
287
*
xScale
-
20
,
60
+
offset
,
287
*
xScale
,
324
*
yScale
));
}
showingcode
=
code
;
...
...
@@ -1521,18 +1521,23 @@ void Game::OnResize() {
irr
::
gui
::
CGUITTFont
*
old_numFont
=
numFont
;
irr
::
gui
::
CGUITTFont
*
old_adFont
=
adFont
;
irr
::
gui
::
CGUITTFont
*
old_lpcFont
=
lpcFont
;
irr
::
gui
::
CGUITTFont
*
old_guiFont
=
guiFont
;
irr
::
gui
::
CGUITTFont
*
old_textFont
=
textFont
;
numFont
=
irr
::
gui
::
CGUITTFont
::
createTTFont
(
env
,
gameConf
.
numfont
,
(
yScale
>
0.5
?
16
*
yScale
:
8
));
adFont
=
irr
::
gui
::
CGUITTFont
::
createTTFont
(
env
,
gameConf
.
numfont
,
(
yScale
>
0.75
?
12
*
yScale
:
9
));
lpcFont
=
irr
::
gui
::
CGUITTFont
::
createTTFont
(
env
,
gameConf
.
numfont
,
48
*
yScale
);
guiFont
=
irr
::
gui
::
CGUITTFont
::
createTTFont
(
env
,
gameConf
.
textfont
,
gameConf
.
textfontsize
*
yScale
);
env
->
getSkin
()
->
setFont
(
guiFont
);
textFont
=
irr
::
gui
::
CGUITTFont
::
createTTFont
(
env
,
gameConf
.
textfont
,
gameConf
.
textfontsize
*
yScale
);
old_numFont
->
drop
();
old_adFont
->
drop
();
old_lpcFont
->
drop
();
//guiFont = irr::gui::CGUITTFont::createTTFont(env, gameConf.textfont, gameConf.textfontsize * yScale
);
//env->getSkin()->setFont(guiFont
);
old_guiFont
->
drop
(
);
old_textFont
->
drop
(
);
recti
menuposition
=
ResizeWin
(
370
,
200
,
650
,
415
);
wMainMenu
->
setRelativePosition
(
recti
(
menuposition
.
UpperLeftCorner
.
X
,
menuposition
.
UpperLeftCorner
.
Y
,
menuposition
.
LowerRightCorner
.
X
+
300
,
menuposition
.
LowerRightCorner
.
Y
+
185
));
wDeckEdit
->
setRelativePosition
(
Resize
(
309
,
8
,
605
,
130
));
wDeckEdit
->
setRelativePosition
(
Resize
(
309
,
5
,
605
,
130
));
cbDBLFList
->
setRelativePosition
(
Resize
(
80
,
5
,
220
,
30
));
cbDBDecks
->
setRelativePosition
(
Resize
(
80
,
35
,
220
,
60
));
btnClearDeck
->
setRelativePosition
(
Resize
(
115
,
99
,
165
,
120
));
...
...
@@ -1544,19 +1549,19 @@ void Game::OnResize() {
wSort
->
setRelativePosition
(
Resize
(
930
,
132
,
1020
,
156
));
cbSortType
->
setRelativePosition
(
Resize
(
10
,
2
,
85
,
22
));
wFilter
->
setRelativePosition
(
Resize
(
610
,
8
,
1020
,
130
));
wFilter
->
setRelativePosition
(
Resize
(
610
,
5
,
1020
,
130
));
scrFilter
->
setRelativePosition
(
Resize
(
999
,
161
,
1019
,
629
));
cbCardType
->
setRelativePosition
(
Resize
(
60
,
3
,
120
,
23
));
cbCardType2
->
setRelativePosition
(
Resize
(
130
,
3
,
190
,
23
));
cbRace
->
setRelativePosition
(
Resize
(
60
,
4
9
,
190
,
69
));
cbAttribute
->
setRelativePosition
(
Resize
(
60
,
2
6
,
190
,
4
6
));
cbLimit
->
setRelativePosition
(
Resize
(
260
,
3
,
390
,
23
));
ebStar
->
setRelativePosition
(
Resize
(
60
,
72
,
100
,
92
));
ebScale
->
setRelativePosition
(
Resize
(
150
,
72
,
190
,
92
));
ebAttack
->
setRelativePosition
(
Resize
(
260
,
2
6
,
340
,
4
6
));
ebDefense
->
setRelativePosition
(
Resize
(
260
,
4
9
,
340
,
69
));
ebCardName
->
setRelativePosition
(
Resize
(
260
,
72
,
390
,
92
));
btnEffectFilter
->
setRelativePosition
(
Resize
(
345
,
2
8
,
390
,
69
));
cbCardType
->
setRelativePosition
(
Resize
(
60
,
25
/
6
,
120
,
20
+
25
/
6
));
cbCardType2
->
setRelativePosition
(
Resize
(
130
,
25
/
6
,
190
,
20
+
25
/
6
));
cbRace
->
setRelativePosition
(
Resize
(
60
,
4
0
+
75
/
6
,
190
,
60
+
75
/
6
));
cbAttribute
->
setRelativePosition
(
Resize
(
60
,
2
0
+
50
/
6
,
190
,
40
+
50
/
6
));
cbLimit
->
setRelativePosition
(
Resize
(
260
,
25
/
6
,
390
,
20
+
25
/
6
));
ebStar
->
setRelativePosition
(
Resize
(
60
,
60
+
100
/
6
,
100
,
80
+
100
/
6
));
ebScale
->
setRelativePosition
(
Resize
(
150
,
60
+
100
/
6
,
190
,
80
+
100
/
6
));
ebAttack
->
setRelativePosition
(
Resize
(
260
,
2
0
+
50
/
6
,
340
,
40
+
50
/
6
));
ebDefense
->
setRelativePosition
(
Resize
(
260
,
4
0
+
75
/
6
,
340
,
60
+
75
/
6
));
ebCardName
->
setRelativePosition
(
Resize
(
260
,
60
+
100
/
6
,
390
,
80
+
100
/
6
));
btnEffectFilter
->
setRelativePosition
(
Resize
(
345
,
2
0
+
50
/
6
,
390
,
60
+
75
/
6
));
btnStartFilter
->
setRelativePosition
(
Resize
(
260
,
80
+
125
/
6
,
390
,
100
+
125
/
6
));
if
(
btnClearFilter
)
btnClearFilter
->
setRelativePosition
(
Resize
(
205
,
80
+
125
/
6
,
255
,
100
+
125
/
6
));
...
...
@@ -1564,17 +1569,17 @@ void Game::OnResize() {
wCategories
->
setRelativePosition
(
ResizeWin
(
450
,
60
,
1000
,
270
));
wLinkMarks
->
setRelativePosition
(
ResizeWin
(
700
,
30
,
820
,
150
));
stBanlist
->
setRelativePosition
(
Resize
Win
(
10
,
9
,
100
,
29
));
stDeck
->
setRelativePosition
(
Resize
Win
(
10
,
39
,
100
,
59
));
stCategory
->
setRelativePosition
(
Resize
Win
(
10
,
5
,
70
,
25
));
stLimit
->
setRelativePosition
(
Resize
Win
(
205
,
5
,
280
,
25
));
stAttribute
->
setRelativePosition
(
Resize
Win
(
10
,
28
,
70
,
48
));
stRace
->
setRelativePosition
(
Resize
Win
(
10
,
51
,
70
,
71
));
stAttack
->
setRelativePosition
(
Resize
Win
(
205
,
28
,
280
,
48
));
stDefense
->
setRelativePosition
(
Resize
Win
(
205
,
51
,
280
,
71
));
stStar
->
setRelativePosition
(
Resize
Win
(
10
,
74
,
80
,
94
));
stSearch
->
setRelativePosition
(
Resize
Win
(
205
,
74
,
280
,
94
));
stScale
->
setRelativePosition
(
Resize
Win
(
110
,
74
,
150
,
94
));
stBanlist
->
setRelativePosition
(
Resize
(
10
,
9
,
100
,
29
));
stDeck
->
setRelativePosition
(
Resize
(
10
,
39
,
100
,
59
));
stCategory
->
setRelativePosition
(
Resize
(
10
,
2
+
25
/
6
,
70
,
22
+
25
/
6
));
stLimit
->
setRelativePosition
(
Resize
(
205
,
2
+
25
/
6
,
280
,
22
+
25
/
6
));
stAttribute
->
setRelativePosition
(
Resize
(
10
,
22
+
50
/
6
,
70
,
42
+
50
/
6
));
stRace
->
setRelativePosition
(
Resize
(
10
,
42
+
75
/
6
,
70
,
62
+
75
/
6
));
stAttack
->
setRelativePosition
(
Resize
(
205
,
22
+
50
/
6
,
280
,
42
+
50
/
6
));
stDefense
->
setRelativePosition
(
Resize
(
205
,
42
+
75
/
6
,
280
,
62
+
75
/
6
));
stStar
->
setRelativePosition
(
Resize
(
10
,
62
+
100
/
6
,
70
,
82
+
100
/
6
));
stSearch
->
setRelativePosition
(
Resize
(
205
,
62
+
100
/
6
,
280
,
82
+
100
/
6
));
stScale
->
setRelativePosition
(
Resize
(
100
,
62
+
100
/
6
,
160
,
82
+
100
/
6
));
btnSideOK
->
setRelativePosition
(
Resize
(
510
,
40
,
820
,
80
));
btnSideShuffle
->
setRelativePosition
(
Resize
(
310
,
100
,
370
,
130
));
btnSideSort
->
setRelativePosition
(
Resize
(
375
,
100
,
435
,
130
));
...
...
@@ -1626,7 +1631,9 @@ void Game::OnResize() {
wCardImg
->
setRelativePosition
(
ResizeCard
(
1
,
1
,
20
,
18
));
imgCard
->
setRelativePosition
(
ResizeCard
(
10
,
9
,
0
,
0
));
wInfos
->
setRelativePosition
(
Resize
(
1
,
275
,
301
,
639
));
stName
->
setRelativePosition
(
recti
(
10
,
10
,
287
*
xScale
,
32
));
stName
->
setRelativePosition
(
recti
(
10
,
10
,
300
*
xScale
-
13
,
10
+
22
*
yScale
));
stInfo
->
setRelativePosition
(
recti
(
15
,
37
*
yScale
,
300
*
xScale
-
13
,
60
*
yScale
));
stDataInfo
->
setRelativePosition
(
recti
(
15
,
60
*
yScale
,
300
*
xScale
-
13
,
83
*
yScale
));
lstLog
->
setRelativePosition
(
Resize
(
10
,
10
,
290
,
290
));
//const auto& tsize = stText->getRelativePosition();
if
(
showingcode
)
...
...
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