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

v0.6.1: slightly improved the UI in the journal window

Browse Source
This commit is contained in:
Evan Debenham 2017-08-06 20:37:20 -04:00
parent 91e457c2eb
commit 14a9ca59b6
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java
View File

@ -42,7 +42,6 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.ScrollPane;
import com.watabou.noosa.BitmapText; import com.watabou.noosa.BitmapText;
import com.watabou.noosa.ColorBlock; import com.watabou.noosa.ColorBlock;
import com.watabou.noosa.Image; import com.watabou.noosa.Image;
import com.watabou.noosa.RenderedText;
import com.watabou.noosa.ui.Component; import com.watabou.noosa.ui.Component;
import java.util.ArrayList; import java.util.ArrayList;
@ -219,17 +218,18 @@ public class WndJournal extends WndTabbed {
float pos = 0; float pos = 0;
RenderedText title = PixelScene.renderText(Document.ADVENTURERS_GUIDE.title(), 9);
title.hardlight(TITLE_COLOR);
title.x = (width() - title.width())/2f;
title.y = pos + (ITEM_HEIGHT - title.baseLine())/2f;
PixelScene.align(title);
content.add(title);
ColorBlock line = new ColorBlock( width(), 1, 0xFF222222); ColorBlock line = new ColorBlock( width(), 1, 0xFF222222);
line.y = pos; line.y = pos;
content.add(line); content.add(line);
pos += ITEM_HEIGHT;
RenderedTextMultiline title = PixelScene.renderMultiline(Document.ADVENTURERS_GUIDE.title(), 9);
title.hardlight(TITLE_COLOR);
title.maxWidth( (int)width() - 2 );
title.setPos( (width() - title.width())/2f, pos + 1 + ((ITEM_HEIGHT) - title.height())/2f);
PixelScene.align(title);
content.add(title);
pos += Math.max(ITEM_HEIGHT, title.bottom());
for (String page : Document.ADVENTURERS_GUIDE.pages()){ for (String page : Document.ADVENTURERS_GUIDE.pages()){
GuideItem item = new GuideItem( page ); GuideItem item = new GuideItem( page );
@ -302,17 +302,18 @@ public class WndJournal extends WndTabbed {
//Keys //Keys
ArrayList<Notes.KeyRecord> keys = Notes.getRecords(Notes.KeyRecord.class); ArrayList<Notes.KeyRecord> keys = Notes.getRecords(Notes.KeyRecord.class);
if (!keys.isEmpty()){ if (!keys.isEmpty()){
RenderedText keyTitle = PixelScene.renderText(Messages.get(this, "keys"), 9);
keyTitle.hardlight(TITLE_COLOR);
keyTitle.x = (width() - keyTitle.width())/2f;
keyTitle.y = pos + (ITEM_HEIGHT - keyTitle.baseLine())/2f;
PixelScene.align(keyTitle);
content.add(keyTitle);
ColorBlock line = new ColorBlock( width(), 1, 0xFF222222); ColorBlock line = new ColorBlock( width(), 1, 0xFF222222);
line.y = pos; line.y = pos;
content.add(line); content.add(line);
pos += ITEM_HEIGHT;
RenderedTextMultiline title = PixelScene.renderMultiline(Messages.get(this, "keys"), 9);
title.hardlight(TITLE_COLOR);
title.maxWidth( (int)width() - 2 );
title.setPos( (width() - title.width())/2f, pos + 1 + ((ITEM_HEIGHT) - title.height())/2f);
PixelScene.align(title);
content.add(title);
pos += Math.max(ITEM_HEIGHT, title.bottom());
} }
for(Notes.Record rec : keys){ for(Notes.Record rec : keys){
ListItem item = new ListItem( Icons.get(Icons.DEPTH), ListItem item = new ListItem( Icons.get(Icons.DEPTH),
@ -326,17 +327,18 @@ public class WndJournal extends WndTabbed {
//Landmarks //Landmarks
ArrayList<Notes.LandmarkRecord> landmarks = Notes.getRecords(Notes.LandmarkRecord.class); ArrayList<Notes.LandmarkRecord> landmarks = Notes.getRecords(Notes.LandmarkRecord.class);
if (!landmarks.isEmpty()){ if (!landmarks.isEmpty()){
RenderedText markTitle = PixelScene.renderText(Messages.get(this, "landmarks"), 9);
markTitle.hardlight(TITLE_COLOR);
markTitle.x = (width() - markTitle.width())/2f;
markTitle.y = pos + (ITEM_HEIGHT - markTitle.baseLine())/2f;
PixelScene.align(markTitle);
content.add(markTitle);
ColorBlock line = new ColorBlock( width(), 1, 0xFF222222); ColorBlock line = new ColorBlock( width(), 1, 0xFF222222);
line.y = pos; line.y = pos;
content.add(line); content.add(line);
pos += ITEM_HEIGHT;
RenderedTextMultiline title = PixelScene.renderMultiline(Messages.get(this, "landmarks"), 9);
title.hardlight(TITLE_COLOR);
title.maxWidth( (int)width() - 2 );
title.setPos( (width() - title.width())/2f, pos + 1 + ((ITEM_HEIGHT) - title.height())/2f);
PixelScene.align(title);
content.add(title);
pos += Math.max(ITEM_HEIGHT, title.bottom());
} }
for (Notes.Record rec : landmarks) { for (Notes.Record rec : landmarks) {
ListItem item = new ListItem( Icons.get(Icons.DEPTH), ListItem item = new ListItem( Icons.get(Icons.DEPTH),
@ -510,7 +512,7 @@ public class WndJournal extends WndTabbed {
if (!seen) { if (!seen) {
icon.copy( new ItemSprite( ItemSpriteSheet.WEAPON_HOLDER + currentItemIdx, null) ); icon.copy( new ItemSprite( ItemSpriteSheet.WEAPON_HOLDER + currentItemIdx, null) );
label.text("???"); label.text("?????? ????????????? ????????? ?????");
label.hardlight( 0x999999 ); label.hardlight( 0x999999 );
} else if (!IDed) { } else if (!IDed) {
icon.copy( new ItemSprite( ItemSpriteSheet.WEAPON_HOLDER + currentItemIdx, null) ); icon.copy( new ItemSprite( ItemSpriteSheet.WEAPON_HOLDER + currentItemIdx, null) );