OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-13 21:18:13 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Bugfix: auto-hide quickslots when displaying worldmap and preferences.showQuickslotsWhenToolboxIsVisible = true

Browse Source
This commit is contained in:
Oskar Wiksten
2013-07-16 10:45:15 +02:00
parent 919132a564
commit c24c264f1e
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ToolboxView.java
View File

@@ -92,17 +92,15 @@ public final class ToolboxView extends LinearLayout implements OnClickListener {
toggleQuickslotItemView();
} else if (btn == toolbox_map) {
if (!WorldMapController.displayWorldMap(context, world)) return;
setVisibility(View.GONE);
hide(false);
} else if (btn == toolbox_save) {
if (Dialogs.showSave((Activity)getContext(), controllers, world)) {
setVisibility(View.GONE);
hide(false);
}
} else if (btn == toolbox_combatlog) {
Dialogs.showCombatLog(getContext(), controllers, world);
setVisibility(View.GONE);
hide(false);
}
if (getVisibility() == View.GONE) setToolboxIcon(false);
}
private void toggleQuickslotItemView() {
@@ -119,13 +117,13 @@ public final class ToolboxView extends LinearLayout implements OnClickListener {
}
private void toggleVisibility() {
if (getVisibility() == View.VISIBLE) hide();
if (getVisibility() == View.VISIBLE) hide(preferences.enableUiAnimations);
else show();
}
private void hide() {
private void hide(boolean animate) {
if (getVisibility() != View.GONE) {
if (preferences.enableUiAnimations) {
if (animate) {
startAnimation(hideAnimation);
} else {
setVisibility(View.GONE);