jisangs/chocomae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: TabLayout

Browse Source
This commit is contained in:
Jisang Park
2019-07-26 22:31:00 +09:00
parent 9c26aa2a71
commit 05418be664
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/lib/flat_button/app_group_tab.js
+17 -17
View File
@@ -45,22 +45,22 @@ AppGroupTab.prototype.createTab = function(index) {
AppGroupTab.BUTTON_COLOR_DISABLED_HEX AppGroupTab.BUTTON_COLOR_DISABLED_HEX
); );
setting.setIconColor( setting.setIconColor(
AppGroupTab.STROKE_COLOR_OUT_HEX, AppGroupTab.ICON_COLOR_OUT_HEX,
AppGroupTab.STROKE_COLOR_OVER_HEX, AppGroupTab.ICON_COLOR_OVER_HEX,
AppGroupTab.STROKE_COLOR_DOWN_HEX, AppGroupTab.ICON_COLOR_DOWN_HEX,
AppGroupTab.STROKE_COLOR_DISABLED_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,
MainColor.DARK_CHOCO_HEX, MainColor.DARK_CHOCO_HEX,
MainColor.DARK_CHOCO_HEX MainColor.DARK_CHOCO_HEX
); );
setting.setTextColor( setting.setTextColor(
AppGroupTab.TEXT_COLOR_OUT_HEX, AppGroupTab.TEXT_COLOR_OUT_STRING,
AppGroupTab.TEXT_COLOR_OVER_HEX, AppGroupTab.TEXT_COLOR_OVER_STRING,
AppGroupTab.TEXT_COLOR_DOWN_HEX, AppGroupTab.TEXT_COLOR_DOWN_STRING,
AppGroupTab.TEXT_COLOR_DISABLED_HEX AppGroupTab.TEXT_COLOR_DISABLED_STRING
); );
@@ -84,17 +84,17 @@ AppGroupTab.prototype.createTab = function(index) {
AppGroupTab.STROKE_COLOR_OUT_HEX = 0xAA6666; AppGroupTab.ICON_COLOR_OUT_HEX = 0xAA6666;
AppGroupTab.STROKE_COLOR_OVER_HEX = 0x884444; AppGroupTab.ICON_COLOR_OVER_HEX = 0x884444;
AppGroupTab.STROKE_COLOR_DOWN_HEX = 0x884444; AppGroupTab.ICON_COLOR_DOWN_HEX = 0x884444;
AppGroupTab.STROKE_COLOR_DISABLED_HEX = 0x333333; AppGroupTab.ICON_COLOR_DISABLED_HEX = 0x333333;
AppGroupTab.BUTTON_COLOR_OUT_HEX = 0xffdddd; AppGroupTab.BUTTON_COLOR_OUT_HEX = 0xffdddd;
AppGroupTab.BUTTON_COLOR_OVER_HEX = 0xddaaaa; AppGroupTab.BUTTON_COLOR_OVER_HEX = 0xddaaaa;
AppGroupTab.BUTTON_COLOR_DOWN_HEX = 0xddaaaa; AppGroupTab.BUTTON_COLOR_DOWN_HEX = 0xddaaaa;
AppGroupTab.BUTTON_COLOR_DISABLED_HEX = 0x666666; AppGroupTab.BUTTON_COLOR_DISABLED_HEX = 0x666666;
AppGroupTab.TEXT_COLOR_OUT_HEX = "#aa6666"; AppGroupTab.TEXT_COLOR_OUT_STRING = "#aa6666";
AppGroupTab.TEXT_COLOR_OVER_HEX = "#884444"; AppGroupTab.TEXT_COLOR_OVER_STRING = "#884444";
AppGroupTab.TEXT_COLOR_DOWN_HEX = "#884444"; AppGroupTab.TEXT_COLOR_DOWN_STRING = "#884444";
AppGroupTab.TEXT_COLOR_DISABLED_HEX = "#333333"; AppGroupTab.TEXT_COLOR_DISABLED_STRING = "#333333";
src/game/lib/flat_button/basic_tab.js
+5 -4
View File
@@ -174,6 +174,7 @@ BasicTab.prototype.makeShortcutText = function() {
shortcutText.anchor.set(0.5); shortcutText.anchor.set(0.5);
shortcutText.fontSize = BasicTab.SHORTCUT_TEXT_FONTSIZE; shortcutText.fontSize = BasicTab.SHORTCUT_TEXT_FONTSIZE;
// shortcutText.fontSize = this.setting.shortcutTextSize;
shortcutText.fontWeight = "normal"; shortcutText.fontWeight = "normal";
// shortcutText.addColor(this.setting.textColors.over, 0); // shortcutText.addColor(this.setting.textColors.over, 0);
shortcutText.addColor("0xffffff", 0); shortcutText.addColor("0xffffff", 0);
@@ -274,7 +275,7 @@ BasicTab.prototype.mouseOut = function() {
if(this.shortcutText !== undefined) if(this.shortcutText !== undefined)
this.shortcutText.fill = this.setting.textColors.out; 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() { BasicTab.prototype.mouseOver = function() {
@@ -287,7 +288,7 @@ BasicTab.prototype.mouseOver = function() {
if(this.shortcutText !== undefined) if(this.shortcutText !== undefined)
this.shortcutText.fill = this.setting.textColors.over; 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() { BasicTab.prototype.mouseDown = function() {
@@ -300,7 +301,7 @@ BasicTab.prototype.mouseDown = function() {
if(this.shortcutText !== undefined) if(this.shortcutText !== undefined)
this.shortcutText.fill = this.setting.textColors.down; 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() { BasicTab.prototype.buttonDisabled = function() {
@@ -313,7 +314,7 @@ BasicTab.prototype.buttonDisabled = function() {
if(typeof this.shortcutText !== undefined) if(typeof this.shortcutText !== undefined)
this.shortcutText.fill = this.setting.textColors.disabled; this.shortcutText.fill = this.setting.textColors.disabled;
// this.activeLineSprite.tint = this.setting.activeColors.disabled; // this.activeLineSprite.tint = this.setting.activeLineColors.disabled;
} }
src/game/lib/flat_button/tab_layout.js
+1 -1
View File
@@ -59,7 +59,7 @@ TabLayout.prototype.selectedTab = function(tab) {
TabLayout.prototype.updateActiveLine = function() { TabLayout.prototype.updateActiveLine = function() {
var count = this.tabGroup.length; var count = this.tabGroup.length;
for(var i = 0; i < count; i++) for(var i = 0; i < count; i++)
this.tabGroup[i].setActive(false); this.tabGroup[i].setActive(false);
this.tabGroup[this.activeTabIndex].setActive(true); this.tabGroup[this.activeTabIndex].setActive(true);
} }
src/game/lib/flat_button/tab_setting.js
+8 -7
View File
@@ -5,11 +5,12 @@ function TabSetting(x, y, width, height) {
this.height = height; this.height = height;
this.fontSize = 10; this.fontSize = 10;
this.shortcutFontSize = BasicTab.SHORTCUT_TEXT_FONTSIZE;
this.buttonColors = TabSetting.DEFAULT_BUTTON_COLORS; this.buttonColors = TabSetting.DEFAULT_BUTTON_COLORS;
this.textColors = TabSetting.DEFAULT_TEXT_COLORS; this.textColors = TabSetting.DEFAULT_TEXT_COLORS;
this.iconColors = TabSetting.DEFAULT_ICON_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; this.fontStyle = TabSetting.DEFAULT_TEXT_FONT;
}; };
@@ -37,12 +38,12 @@ TabSetting.prototype.setTextColor = function(out, over, down, disabled) {
this.textColors.disabled = disabled; this.textColors.disabled = disabled;
} }
TabSetting.prototype.setActiveColor = function(out, over, down, disabled) { TabSetting.prototype.setActiveLineColor = function(out, over, down, disabled) {
this.activeColors = { }; this.activeLineColors = { };
this.activeColors.out = out; this.activeLineColors.out = out;
this.activeColors.over = over; this.activeLineColors.over = over;
this.activeColors.down = down; this.activeLineColors.down = down;
this.activeColors.disabled = disabled; this.activeLineColors.disabled = disabled;
} }
TabSetting.prototype.setIconColor = function(out, over, down, disabled) { TabSetting.prototype.setIconColor = function(out, over, down, disabled) {
src/game/main_menu/main_menu.js
-2
View File
@@ -261,8 +261,6 @@ MainMenu.prototype.makeAppGroupButtons = function() {
this.appGroupTabLayout.add(mousePlayAppGroupTab); this.appGroupTabLayout.add(mousePlayAppGroupTab);
this.appGroupTabLayout.createTabs(); this.appGroupTabLayout.createTabs();
} }