From 2ffbef67fd18d9a9cd3001634a874da0869d8d53 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 6 Jul 2017 18:43:15 -0400 Subject: [PATCH] v0.6.1: major adjustments to layout of journal window New catalogs tabs don't work yet. --- core/src/main/assets/items.png | Bin 14529 -> 14616 bytes .../sprites/ItemSpriteSheet.java | 20 ++-- .../shatteredpixeldungeon/ui/RedButton.java | 4 + .../shatteredpixeldungeon/ui/Toolbar.java | 8 ++ .../windows/WndJournal.java | 107 +++++++++--------- 5 files changed, 75 insertions(+), 64 deletions(-) diff --git a/core/src/main/assets/items.png b/core/src/main/assets/items.png index 7673bac6ee345d67591a558cb291b3158e763935..cee918fce9e45b67ac3e6ea9771edf0e7674f0cd 100644 GIT binary patch literal 14616 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 WS;_h~x9v|WM-QDm_{PrX#{U2`QB-vR literal 14529 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 items = new ArrayList<>(); - private static boolean showPotions = true; - public Catalog(){ super(); - btnPotions = new RedButton( "" ){ - @Override - protected void onClick() { - latestPressedIdx = 0; - updateList(); - } - }; - btnPotions.icon(new ItemSprite(ItemSpriteSheet.POTION_HOLDER, null)); - add( btnPotions ); - - btnScrolls = new RedButton( "" ){ - @Override - protected void onClick() { - latestPressedIdx = 1; - updateList(); - } - }; - btnScrolls.icon(new ItemSprite(ItemSpriteSheet.SCROLL_HOLDER, null)); - add( btnScrolls ); - - btnRings = new RedButton( "" ){ - @Override - protected void onClick() { - latestPressedIdx = 2; - updateList(); - } - }; - btnRings.icon(new ItemSprite(ItemSpriteSheet.RING_HOLDER, null)); - add( btnRings ); + itemButtons = new RedButton[NUM_BUTTONS]; + for (int i = 0; i < NUM_BUTTONS; i++){ + final int idx = i; + itemButtons[i] = new RedButton( "" ){ + @Override + protected void onClick() { + latestPressedIdx = idx; + updateList(); + } + }; + itemButtons[i].icon(new ItemSprite(ItemSpriteSheet.WEAPON_HOLDER + i, null)); + add( itemButtons[i] ); + } list = new ScrollPane( new Component() ) { @Override @@ -306,40 +293,48 @@ public class WndJournal extends WndTabbed { add( list ); } - private static final int BUTTON_WIDTH = 36; - private static final int BUTTON_HEIGHT = 18; + private static final int BUTTON_HEIGHT = 17; @Override protected void layout() { super.layout(); - btnPotions.setRect(0, 0, BUTTON_WIDTH, BUTTON_HEIGHT); - PixelScene.align( btnPotions ); + int perRow = ShatteredPixelDungeon.landscape() ? NUM_BUTTONS : 4; + float buttonWidth = (width() - (perRow-1))/perRow; - btnScrolls.setRect((width() - BUTTON_WIDTH)/2f, 0, BUTTON_WIDTH, BUTTON_HEIGHT); - PixelScene.align(btnScrolls); + for (int i = 0; i < NUM_BUTTONS; i++) { + itemButtons[i].setRect((i%perRow) * (buttonWidth + 1), (i/perRow) * (BUTTON_HEIGHT + 1), + buttonWidth, BUTTON_HEIGHT); + PixelScene.align(itemButtons[i]); + } - btnRings.setRect(width() - BUTTON_WIDTH, 0, BUTTON_WIDTH, BUTTON_HEIGHT); - PixelScene.align(btnRings); - - list.setRect( 0, btnPotions.height() + 1, width, height - btnPotions.height() - 1 ); + list.setRect(0, itemButtons[NUM_BUTTONS-1].bottom() + 1, width, + height - itemButtons[NUM_BUTTONS-1].bottom() - 1); } private void updateList() { items.clear(); + for (int i = 0; i < NUM_BUTTONS; i++){ + if (i == latestPressedIdx){ + itemButtons[i].icon().color(TITLE_COLOR); + } else { + itemButtons[i].icon().resetColor(); + } + } + Component content = list.content(); content.clear(); list.scrollTo( 0, 0 ); ArrayList> itemClasses; - if (latestPressedIdx == 0){ + if (latestPressedIdx == 5){ itemClasses = new ArrayList<>(Arrays.asList(Generator.Category.POTION.classes)); for ( Class unknown : Potion.getUnknown()){ if (itemClasses.remove(unknown)) itemClasses.add(unknown); } - } else if (latestPressedIdx == 1) { + } else if (latestPressedIdx == 6) { itemClasses = new ArrayList<>(Arrays.asList(Generator.Category.SCROLL.classes)); for ( Class unknown : Scroll.getUnknown()){ if (itemClasses.remove(unknown)) itemClasses.add(unknown);