Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shop + Other UI Fixes #1615

Merged
merged 10 commits into from Feb 12, 2019

Conversation

Projects
None yet
4 participants
@fmatthew5876
Copy link
Contributor

fmatthew5876 commented Feb 2, 2019

Fixes #1614
Fixes #1611

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:shop_fix branch from 7660ac2 to 5955a8d Feb 2, 2019

@@ -92,13 +100,18 @@ void Window_ShopParty::Refresh() {
if (phase == 3) {
phase = 1;
}
bool equippable = actor->IsEquippable(item_id);
BitmapRef bm = bitmaps[i][equippable ? phase : 1][equippable ? 1 : 0];
bool usable = actor->IsEquippable(item_id);

This comment has been minimized.

@fmatthew5876

fmatthew5876 Feb 2, 2019

Author Contributor

This IsEquippable() method is suspect.

@@ -27,7 +27,8 @@
Window_ShopParty::Window_ShopParty(int ix, int iy, int iwidth, int iheight) :
Window_Base(ix, iy, iwidth, iheight) {

SetContents(Bitmap::Create(width - 16, height - 16));
SetBorderX(4);
SetContents(Bitmap::Create(width - GetBorderX() * 2, height - 16));

This comment has been minimized.

@fmatthew5876

fmatthew5876 Feb 2, 2019

Author Contributor

Maybe we need a SetContentsDefault() method which does SetContents(Bitmap::Create(width - border_x*2, height - border_y*2))

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:shop_fix branch from 9b45d57 to e848bfe Feb 2, 2019

@fmatthew5876 fmatthew5876 changed the title Shop Fixes Shop + Other UI Fixes Feb 3, 2019

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:shop_fix branch from 73291d5 to 89e33b0 Feb 3, 2019

@fmatthew5876

This comment has been minimized.

Copy link
Contributor Author

fmatthew5876 commented Feb 3, 2019

This is ready now. I've gone through each menu using the below system graphic. (Flip the lines 90 degrees to test vertical vs horizontal alignment)

Please while reviewing this check the alignment of the text in all the menus. I think I finally hit everything but its easy to miss a pixel somewhere.

system

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:shop_fix branch 3 times, most recently from 5888199 to 4242a66 Feb 3, 2019

@fdelapena fdelapena added this to the 0.6.0 milestone Feb 6, 2019

@carstene1ns
Copy link
Member

carstene1ns left a comment

Looks good to me.

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:shop_fix branch from b72753c to e4e2432 Feb 9, 2019

@fmatthew5876

This comment has been minimized.

Copy link
Contributor Author

fmatthew5876 commented Feb 9, 2019

Rebased to master

@Ghabry

This comment has been minimized.

Copy link
Member

Ghabry commented Feb 10, 2019

the way you implemented the half-spacing will also work later with freetype/harfbuzz. thx

@Ghabry

Ghabry approved these changes Feb 10, 2019

@Ghabry Ghabry merged commit 405afed into EasyRPG:master Feb 12, 2019

7 checks passed

Android (armeabi-v7a) Build finished.
Details
GNU/Linux Build finished.
Details
OSX Build finished.
Details
Wii (SDL1) Build finished.
Details
Windows (x64) Build finished.
Details
Windows (x86) Build finished.
Details
web Build finished.
Details
@Ghabry

This comment has been minimized.

Copy link
Member

Ghabry commented Mar 4, 2019

Based on the stacktrace I can also find "Crash when selling empty item" in the Android crash list.

But not that common, only 12 users affected in 60 days. 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.