mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-05-17 06:34:07 +00:00
Code Issues Releases Wiki Activity

mapeditor:: fixed UI elements crashing into each other

Browse Source
This commit is contained in:
Zeno Rogue 2019-08-10 22:30:02 +02:00
parent a1faa299df
commit cc0584f7d1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mapeditor.cpp
View File

@ -667,8 +667,12 @@ namespace mapeditor {
bool choosefile = false; bool choosefile = false;
int editor_fsize() {
return min(vid.fsize + 5, (vid.yres - 16) /32 );
}
void displayFunctionKeys() { void displayFunctionKeys() {
int fs = min(vid.fsize + 5, vid.yres/26); int fs = editor_fsize();
displayButton(8, vid.yres-8-fs*11, XLAT("F1 = help"), SDLK_F1, 0); displayButton(8, vid.yres-8-fs*11, XLAT("F1 = help"), SDLK_F1, 0);
displayButton(8, vid.yres-8-fs*10, XLAT("F2 = save"), SDLK_F2, 0); displayButton(8, vid.yres-8-fs*10, XLAT("F2 = save"), SDLK_F2, 0);
displayButton(8, vid.yres-8-fs*9, XLAT("F3 = load"), SDLK_F3, 0); displayButton(8, vid.yres-8-fs*9, XLAT("F3 = load"), SDLK_F3, 0);
@ -685,7 +689,7 @@ namespace mapeditor {
cmode = sm::MAP; cmode = sm::MAP;
gamescreen(0); gamescreen(0);
int fs = min(vid.fsize + 5, vid.yres/26); int fs = editor_fsize();
getcstat = '-'; getcstat = '-';
@ -1309,7 +1313,7 @@ namespace mapeditor {
us =usershapes[drawcellShapeGroup()][drawcellShapeID()]; us =usershapes[drawcellShapeGroup()][drawcellShapeID()];
} }
int fs = min(vid.fsize + 5, vid.yres/28); int fs = editor_fsize();
// displayButton(8, 8+fs*9, XLAT("l = lands"), 'l', 0); // displayButton(8, 8+fs*9, XLAT("l = lands"), 'l', 0);
displayfr(8, 8+fs, 2, vid.fsize, line1, 0xC0C0C0, 0); displayfr(8, 8+fs, 2, vid.fsize, line1, 0xC0C0C0, 0);