From 05418be66433f2a0f01e954ddeee26ed198a2a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?= =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?= Date: Fri, 26 Jul 2019 22:31:00 +0900 Subject: [PATCH] Fix: TabLayout --- src/game/lib/flat_button/app_group_tab.js | 34 +++++++++++------------ src/game/lib/flat_button/basic_tab.js | 9 +++--- src/game/lib/flat_button/tab_layout.js | 2 +- src/game/lib/flat_button/tab_setting.js | 15 +++++----- src/game/main_menu/main_menu.js | 2 -- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/game/lib/flat_button/app_group_tab.js b/src/game/lib/flat_button/app_group_tab.js index da8c7e8..5db1e2f 100644 --- a/src/game/lib/flat_button/app_group_tab.js +++ b/src/game/lib/flat_button/app_group_tab.js @@ -45,22 +45,22 @@ AppGroupTab.prototype.createTab = function(index) { AppGroupTab.BUTTON_COLOR_DISABLED_HEX ); setting.setIconColor( - AppGroupTab.STROKE_COLOR_OUT_HEX, - AppGroupTab.STROKE_COLOR_OVER_HEX, - AppGroupTab.STROKE_COLOR_DOWN_HEX, - AppGroupTab.STROKE_COLOR_DISABLED_HEX + AppGroupTab.ICON_COLOR_OUT_HEX, + AppGroupTab.ICON_COLOR_OVER_HEX, + AppGroupTab.ICON_COLOR_DOWN_HEX, + AppGroupTab.ICON_COLOR_DISABLED_HEX ); - setting.setActiveColor( + setting.setActiveLineColor( MainColor.DARK_CHOCO_HEX, MainColor.DARK_CHOCO_HEX, MainColor.DARK_CHOCO_HEX, MainColor.DARK_CHOCO_HEX ); setting.setTextColor( - AppGroupTab.TEXT_COLOR_OUT_HEX, - AppGroupTab.TEXT_COLOR_OVER_HEX, - AppGroupTab.TEXT_COLOR_DOWN_HEX, - AppGroupTab.TEXT_COLOR_DISABLED_HEX + AppGroupTab.TEXT_COLOR_OUT_STRING, + AppGroupTab.TEXT_COLOR_OVER_STRING, + AppGroupTab.TEXT_COLOR_DOWN_STRING, + AppGroupTab.TEXT_COLOR_DISABLED_STRING ); @@ -84,17 +84,17 @@ AppGroupTab.prototype.createTab = function(index) { -AppGroupTab.STROKE_COLOR_OUT_HEX = 0xAA6666; -AppGroupTab.STROKE_COLOR_OVER_HEX = 0x884444; -AppGroupTab.STROKE_COLOR_DOWN_HEX = 0x884444; -AppGroupTab.STROKE_COLOR_DISABLED_HEX = 0x333333; +AppGroupTab.ICON_COLOR_OUT_HEX = 0xAA6666; +AppGroupTab.ICON_COLOR_OVER_HEX = 0x884444; +AppGroupTab.ICON_COLOR_DOWN_HEX = 0x884444; +AppGroupTab.ICON_COLOR_DISABLED_HEX = 0x333333; AppGroupTab.BUTTON_COLOR_OUT_HEX = 0xffdddd; AppGroupTab.BUTTON_COLOR_OVER_HEX = 0xddaaaa; AppGroupTab.BUTTON_COLOR_DOWN_HEX = 0xddaaaa; AppGroupTab.BUTTON_COLOR_DISABLED_HEX = 0x666666; -AppGroupTab.TEXT_COLOR_OUT_HEX = "#aa6666"; -AppGroupTab.TEXT_COLOR_OVER_HEX = "#884444"; -AppGroupTab.TEXT_COLOR_DOWN_HEX = "#884444"; -AppGroupTab.TEXT_COLOR_DISABLED_HEX = "#333333"; \ No newline at end of file +AppGroupTab.TEXT_COLOR_OUT_STRING = "#aa6666"; +AppGroupTab.TEXT_COLOR_OVER_STRING = "#884444"; +AppGroupTab.TEXT_COLOR_DOWN_STRING = "#884444"; +AppGroupTab.TEXT_COLOR_DISABLED_STRING = "#333333"; \ No newline at end of file diff --git a/src/game/lib/flat_button/basic_tab.js b/src/game/lib/flat_button/basic_tab.js index 6186e2a..56fae5d 100644 --- a/src/game/lib/flat_button/basic_tab.js +++ b/src/game/lib/flat_button/basic_tab.js @@ -174,6 +174,7 @@ BasicTab.prototype.makeShortcutText = function() { shortcutText.anchor.set(0.5); shortcutText.fontSize = BasicTab.SHORTCUT_TEXT_FONTSIZE; + // shortcutText.fontSize = this.setting.shortcutTextSize; shortcutText.fontWeight = "normal"; // shortcutText.addColor(this.setting.textColors.over, 0); shortcutText.addColor("0xffffff", 0); @@ -274,7 +275,7 @@ BasicTab.prototype.mouseOut = function() { if(this.shortcutText !== undefined) this.shortcutText.fill = this.setting.textColors.out; - // this.activeLineSprite.tint = this.setting.activeColors.out; + // this.activeLineSprite.tint = this.setting.activeLineColors.out; } BasicTab.prototype.mouseOver = function() { @@ -287,7 +288,7 @@ BasicTab.prototype.mouseOver = function() { if(this.shortcutText !== undefined) this.shortcutText.fill = this.setting.textColors.over; - // this.activeLineSprite.tint = this.setting.activeColors.over; + // this.activeLineSprite.tint = this.setting.activeLineColors.over; } BasicTab.prototype.mouseDown = function() { @@ -300,7 +301,7 @@ BasicTab.prototype.mouseDown = function() { if(this.shortcutText !== undefined) this.shortcutText.fill = this.setting.textColors.down; - // this.activeLineSprite.tint = this.setting.activeColors.down; + // this.activeLineSprite.tint = this.setting.activeLineColors.down; } BasicTab.prototype.buttonDisabled = function() { @@ -313,7 +314,7 @@ BasicTab.prototype.buttonDisabled = function() { if(typeof this.shortcutText !== undefined) this.shortcutText.fill = this.setting.textColors.disabled; - // this.activeLineSprite.tint = this.setting.activeColors.disabled; + // this.activeLineSprite.tint = this.setting.activeLineColors.disabled; } diff --git a/src/game/lib/flat_button/tab_layout.js b/src/game/lib/flat_button/tab_layout.js index 40864a2..e8fb04a 100644 --- a/src/game/lib/flat_button/tab_layout.js +++ b/src/game/lib/flat_button/tab_layout.js @@ -59,7 +59,7 @@ TabLayout.prototype.selectedTab = function(tab) { TabLayout.prototype.updateActiveLine = function() { var count = this.tabGroup.length; for(var i = 0; i < count; i++) - this.tabGroup[i].setActive(false); + this.tabGroup[i].setActive(false); this.tabGroup[this.activeTabIndex].setActive(true); } \ No newline at end of file diff --git a/src/game/lib/flat_button/tab_setting.js b/src/game/lib/flat_button/tab_setting.js index 6495888..855adc8 100644 --- a/src/game/lib/flat_button/tab_setting.js +++ b/src/game/lib/flat_button/tab_setting.js @@ -5,11 +5,12 @@ function TabSetting(x, y, width, height) { this.height = height; this.fontSize = 10; + this.shortcutFontSize = BasicTab.SHORTCUT_TEXT_FONTSIZE; this.buttonColors = TabSetting.DEFAULT_BUTTON_COLORS; this.textColors = TabSetting.DEFAULT_TEXT_COLORS; this.iconColors = TabSetting.DEFAULT_ICON_COLORS; - this.activeColors = TabSetting.DEFAULT_ACTIVE_COLORS; + this.activeLineColors = TabSetting.DEFAULT_ACTIVE_COLORS; this.fontStyle = TabSetting.DEFAULT_TEXT_FONT; }; @@ -37,12 +38,12 @@ TabSetting.prototype.setTextColor = function(out, over, down, disabled) { this.textColors.disabled = disabled; } -TabSetting.prototype.setActiveColor = function(out, over, down, disabled) { - this.activeColors = { }; - this.activeColors.out = out; - this.activeColors.over = over; - this.activeColors.down = down; - this.activeColors.disabled = disabled; +TabSetting.prototype.setActiveLineColor = function(out, over, down, disabled) { + this.activeLineColors = { }; + this.activeLineColors.out = out; + this.activeLineColors.over = over; + this.activeLineColors.down = down; + this.activeLineColors.disabled = disabled; } TabSetting.prototype.setIconColor = function(out, over, down, disabled) { diff --git a/src/game/main_menu/main_menu.js b/src/game/main_menu/main_menu.js index 491758e..2842cc0 100644 --- a/src/game/main_menu/main_menu.js +++ b/src/game/main_menu/main_menu.js @@ -261,8 +261,6 @@ MainMenu.prototype.makeAppGroupButtons = function() { this.appGroupTabLayout.add(mousePlayAppGroupTab); this.appGroupTabLayout.createTabs(); - - }