LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.8.2: adjusted layoutTabs() to allow floating point positions

Browse Source
This commit is contained in:
Evan Debenham 2020-07-13 01:10:45 -04:00
parent 468ef2664c
commit a312ea8350
1 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java
View File

@ -53,7 +53,7 @@ public class WndTabbed extends Window {
super.add( tab ); super.add( tab );
tabs.add( tab ); tabs.add( tab );
return tab; return tab;
} }
@ -109,39 +109,18 @@ public class WndTabbed extends Window {
} }
public void layoutTabs(){ public void layoutTabs(){
//subract two as there's extra horizontal space for those nobs on the top. //subtract two as that horizontal space is transparent at the bottom
int fullWidth = width+chrome.marginHor()-2; int fullWidth = width+chrome.marginHor()-2;
int numTabs = tabs.size(); float numTabs = tabs.size();
float tabWidth = (fullWidth - (numTabs-1))/numTabs;
if (numTabs == 0) float pos = -chrome.marginLeft() + 1;
return; for (Tab tab : tabs){
if (numTabs == 1) { tab.setSize(tabWidth, tabHeight());
tabs.get(0).setSize(fullWidth, tabHeight()); tab.setPos(pos, height);
return; pos = tab.right() + 1;
PixelScene.align(tab);
} }
int spaces = numTabs-1;
int spacing = -1;
while (spacing == -1) {
for (int i = 0; i <= 3; i++){
if ((fullWidth - i*(spaces)) % numTabs == 0) {
spacing = i;
break;
}
}
if (spacing == -1) fullWidth--;
}
int tabWidth = (fullWidth - spacing*(numTabs-1)) / numTabs;
for (int i = 0; i < tabs.size(); i++){
tabs.get(i).setSize(tabWidth, tabHeight());
tabs.get(i).setPos( i == 0 ?
-chrome.marginLeft() + 1 :
tabs.get( i - 1 ).right() + spacing, height );
}
} }
protected int tabHeight() { protected int tabHeight() {