Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-23 07:38:34 +01:00
Code Issues Projects Releases Wiki Activity

Made forward and backward button visibility calculation less stupid

Browse source
This commit is contained in:
Ellpeck 2015-09-28 22:26:43 +02:00
parent 26aab74cb1
commit 99878a1eef
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java
View file

@ -375,6 +375,9 @@ public class GuiBooklet extends GuiScreen{
if(this.currentPage != null){ if(this.currentPage != null){
BookletPage page = this.getNextPage(this.currentChapter, this.currentPage); BookletPage page = this.getNextPage(this.currentChapter, this.currentPage);
if(page != null) this.currentPage = page; if(page != null) this.currentPage = page;
this.getButton(BUTTON_FORWARD_ID).visible = this.getNextPage(this.currentChapter, this.currentPage) != null;
this.getButton(BUTTON_BACK_ID).visible = this.getPrevPage(this.currentChapter, this.currentPage) != null;
} }
else{ else{
this.openIndexEntry(this.currentIndexEntry, this.pageOpenInIndex+1, !(this.currentIndexEntry instanceof BookletEntryAllSearch)); this.openIndexEntry(this.currentIndexEntry, this.pageOpenInIndex+1, !(this.currentIndexEntry instanceof BookletEntryAllSearch));
@ -386,6 +389,9 @@ public class GuiBooklet extends GuiScreen{
if(this.currentPage != null){ if(this.currentPage != null){
BookletPage page = this.getPrevPage(this.currentChapter, this.currentPage); BookletPage page = this.getPrevPage(this.currentChapter, this.currentPage);
if(page != null) this.currentPage = page; if(page != null) this.currentPage = page;
this.getButton(BUTTON_FORWARD_ID).visible = this.getNextPage(this.currentChapter, this.currentPage) != null;
this.getButton(BUTTON_BACK_ID).visible = this.getPrevPage(this.currentChapter, this.currentPage) != null;
} }
else{ else{
this.openIndexEntry(this.currentIndexEntry, this.pageOpenInIndex-1, !(this.currentIndexEntry instanceof BookletEntryAllSearch)); this.openIndexEntry(this.currentIndexEntry, this.pageOpenInIndex-1, !(this.currentIndexEntry instanceof BookletEntryAllSearch));
@ -416,15 +422,6 @@ public class GuiBooklet extends GuiScreen{
} }
} }
} }
if(button.id == BUTTON_FORWARD_ID || button.id == BUTTON_BACK_ID){
if(this.currentChapter != null && this.currentIndexEntry != null){
if(this.currentPage != null){
this.getButton(BUTTON_FORWARD_ID).visible = this.getNextPage(this.currentChapter, this.currentPage) != null;
this.getButton(BUTTON_BACK_ID).visible = this.getPrevPage(this.currentChapter, this.currentPage) != null;
}
}
}
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")