Skip to content

Y
ygopro-2pick
Commit 1efa5145 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 43ba2d14 abc2d79a
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 7 deletions
gframe/game.cpp
View file @ 1efa5145
...@@ -710,15 +710,23 @@ bool Game::Initialize() { ...@@ -710,15 +710,23 @@ bool Game::Initialize() {
wCategories->setDraggable(false); wCategories->setDraggable(false);
wCategories->setVisible(false); wCategories->setVisible(false);
btnCategoryOK = env->addButton(rect<s32>(150, 210, 250, 235), wCategories, BUTTON_CATEGORY_OK, dataManager.GetSysString(1211)); btnCategoryOK = env->addButton(rect<s32>(150, 210, 250, 235), wCategories, BUTTON_CATEGORY_OK, dataManager.GetSysString(1211));
int catewidth = 0; unsigned int catewidth[4];
for(int i = 0; i < 3; ++i)
catewidth[i] = 0;
for(int i = 0; i < 32; ++i) { for(int i = 0; i < 32; ++i) {
unsigned char col = i % 4;
irr::core::dimension2d<unsigned int> dtxt = mainGame->guiFont->getDimension(dataManager.GetSysString(1100 + i)); irr::core::dimension2d<unsigned int> dtxt = mainGame->guiFont->getDimension(dataManager.GetSysString(1100 + i));
if(dtxt.Width + 40 > catewidth) if(dtxt.Width + 40 > catewidth[col])
catewidth = dtxt.Width + 40; catewidth[col] = dtxt.Width + 40;
} }
for(int i = 0; i < 32; ++i) for(int i = 0; i < 32; ++i) {
chkCategory[i] = env->addCheckBox(false, recti(10 + (i % 4) * catewidth, 5 + (i / 4) * 25, 10 + (i % 4 + 1) * catewidth, 5 + (i / 4 + 1) * 25), wCategories, -1, dataManager.GetSysString(1100 + i)); unsigned char col = i % 4;
int wcatewidth = catewidth * 4 + 16; unsigned int left_size = 0;
for (int j = 0; j < col; ++j)
left_size += catewidth[j];
chkCategory[i] = env->addCheckBox(false, recti(10 + left_size, 5 + (i / 4) * 25, 10 + left_size + catewidth[col], 5 + (i / 4 + 1) * 25), wCategories, -1, dataManager.GetSysString(1100 + i));
}
unsigned int wcatewidth = catewidth[0] + catewidth[1] + catewidth[2] + catewidth[3] + 16;
wCategories->setRelativePosition(rect<s32>(1000 - wcatewidth, 60, 1000, 305)); wCategories->setRelativePosition(rect<s32>(1000 - wcatewidth, 60, 1000, 305));
btnCategoryOK->setRelativePosition(recti(wcatewidth / 2 - 50, 210, wcatewidth / 2 + 50, 235)); btnCategoryOK->setRelativePosition(recti(wcatewidth / 2 - 50, 210, wcatewidth / 2 + 50, 235));
btnMarksFilter = env->addButton(rect<s32>(60, 80 + 125 / 6, 190, 100 + 125 / 6), wFilter, BUTTON_MARKS_FILTER, dataManager.GetSysString(1374)); btnMarksFilter = env->addButton(rect<s32>(60, 80 + 125 / 6, 190, 100 + 125 / 6), wFilter, BUTTON_MARKS_FILTER, dataManager.GetSysString(1374));
......
script @ 4718355a
Subproject commit 5a6c0271cfa99dbb150a2c0afa09864a6d1ace2a Subproject commit 4718355a9cff5cba4b7f7faa22daa369ad94f9c4
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