diff --git a/src/game/lib/flat_button/app_group_tab.js b/src/game/lib/flat_button/app_group_tab.js index 5db1e2f..da1824a 100644 --- a/src/game/lib/flat_button/app_group_tab.js +++ b/src/game/lib/flat_button/app_group_tab.js @@ -36,8 +36,10 @@ AppGroupTab.prototype.createTab = function(index) { var y = this.tabLayout.getY() + height / 2; var setting = new TabSetting(x, y, width, height); - setting.setFont("Nanum Pen Script"); - setting.setFontSize(20); + // setting.setFont("Nanum Pen Script"); + setting.setFont("Nanum Gothic"); + setting.setMainFontSize(16); + setting.setShortcutFontSize(14); setting.setButtonColor( AppGroupTab.BUTTON_COLOR_OUT_HEX, AppGroupTab.BUTTON_COLOR_OVER_HEX, @@ -84,17 +86,17 @@ AppGroupTab.prototype.createTab = function(index) { -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 = MainColor.CHOCO_HEX; +AppGroupTab.BUTTON_COLOR_OVER_HEX = MainColor.DARK_CHOCO_HEX; +AppGroupTab.BUTTON_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_HEX; +AppGroupTab.BUTTON_COLOR_DISABLED_HEX = MainColor.BLACK_HEX; -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.ICON_COLOR_OUT_HEX = MainColor.DARK_CHOCO_HEX; +AppGroupTab.ICON_COLOR_OVER_HEX = MainColor.CHOCO_HEX; +AppGroupTab.ICON_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_HEX; +AppGroupTab.ICON_COLOR_DISABLED_HEX = MainColor.DARK_CHOCO_HEX; -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 +AppGroupTab.TEXT_COLOR_OUT_STRING = MainColor.DARK_CHOCO_STRING; +AppGroupTab.TEXT_COLOR_OVER_STRING = MainColor.CHOCO_STRING; +AppGroupTab.TEXT_COLOR_DOWN_STRING = MainColor.LIGHT_CHOCO_STRING; +AppGroupTab.TEXT_COLOR_DISABLED_STRING = MainColor.DARK_CHOCO_STRING; \ 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 56fae5d..eb2b18c 100644 --- a/src/game/lib/flat_button/basic_tab.js +++ b/src/game/lib/flat_button/basic_tab.js @@ -67,11 +67,12 @@ BasicTab.prototype.makeActiveLineSprite = function() { // console.log("strokeWidthPx : " + setting.strokeWidthPx); // console.log("round : " + setting.roundAmount); - var OFFSET_POS_Y = 7; + var OFFSET_POS_Y = 6; + var ACTIVE_LINE_HEIGHT = 3; var buttonWidth = setting.width; var lineWidth = buttonWidth * 3 / 4; - var lineHeight = 5; + var lineHeight = ACTIVE_LINE_HEIGHT; var texture = null; texture = new Phaser.Graphics() @@ -145,8 +146,8 @@ BasicTab.prototype.makeMainText = function() { var mainText = game.add.text(width, height, ""); mainText.anchor.set(0.5); - mainText.fontSize = this.setting.fontSize; - // mainText.fontWeight = "bolder"; + mainText.fontSize = this.setting.mainFontSize; + mainText.fontWeight = "bolder"; mainText.lineSpacing = TabSetting.DEFAULT_TEXT_LINE_SPACING_PX; return mainText; @@ -174,7 +175,7 @@ BasicTab.prototype.makeShortcutText = function() { shortcutText.anchor.set(0.5); shortcutText.fontSize = BasicTab.SHORTCUT_TEXT_FONTSIZE; - // shortcutText.fontSize = this.setting.shortcutTextSize; + shortcutText.fontSize = this.setting.shortcutFontSize; shortcutText.fontWeight = "normal"; // shortcutText.addColor(this.setting.textColors.over, 0); shortcutText.addColor("0xffffff", 0); @@ -220,7 +221,7 @@ BasicTab.prototype.alignContents = function() { var offsetRatio = 7; var offsetMainText = mainTextHeight / offsetRatio; var offsetShortcutText = shortcutTextHeight / offsetRatio; - var gap = (iconSpriteHeight > 0 ? gap = 0 : BasicTab.SHORTCUT_TEXT_FONTSIZE / 2); + var gap = (iconSpriteHeight > 0 ? 0 : gap = BasicTab.SHORTCUT_TEXT_FONTSIZE / 4); if(shortcutTextHeight === 0) { if(mainTextHeight > 0) @@ -232,7 +233,7 @@ BasicTab.prototype.alignContents = function() { if(mainTextHeight > 0) this.mainText.y = this.buttonSprite.height / 2 - shortcutTextHeightHalf + offsetMainText; else if(iconSpriteHeight > 0) - this.iconSprite.y = this.buttonSprite.height / 2 - shortcutTextHeightHalf; // - gap / 4; + this.iconSprite.y = this.buttonSprite.height / 2 - shortcutTextHeightHalf; } this.shortcutText.y = this.buttonSprite.height / 2 + mainContentHeightHalf + offsetShortcutText + gap; diff --git a/src/game/lib/flat_button/tab_setting.js b/src/game/lib/flat_button/tab_setting.js index 855adc8..2670e16 100644 --- a/src/game/lib/flat_button/tab_setting.js +++ b/src/game/lib/flat_button/tab_setting.js @@ -4,7 +4,7 @@ function TabSetting(x, y, width, height) { this.width = width; this.height = height; - this.fontSize = 10; + this.mainFontSize = 10; this.shortcutFontSize = BasicTab.SHORTCUT_TEXT_FONTSIZE; this.buttonColors = TabSetting.DEFAULT_BUTTON_COLORS; @@ -18,8 +18,12 @@ TabSetting.prototype.setFont = function(fontName) { this.font = fontName; } -TabSetting.prototype.setFontSize = function(size) { - this.fontSize = size; +TabSetting.prototype.setMainFontSize = function(size) { + this.mainFontSize = size; +} + +TabSetting.prototype.setShortcutFontSize = function(size) { + this.shortcutFontSize = size; } TabSetting.prototype.setButtonColor = function(out, over, down, disabled) {