diff --git a/desktop/resources/ui/button.9.png b/desktop/resources/ui/button.9.png index 58f31b33..f5857806 100644 Binary files a/desktop/resources/ui/button.9.png and b/desktop/resources/ui/button.9.png differ diff --git a/desktop/resources/ui/button.pressed.9.png b/desktop/resources/ui/button.pressed.9.png index 4aecb238..ba8a87cf 100644 Binary files a/desktop/resources/ui/button.pressed.9.png and b/desktop/resources/ui/button.pressed.9.png differ diff --git a/desktop/resources/ui/ui.atlas b/desktop/resources/ui/ui.atlas index 39b72533..c8899a87 100644 --- a/desktop/resources/ui/ui.atlas +++ b/desktop/resources/ui/ui.atlas @@ -1,28 +1,44 @@ ui.png -size: 256,64 +size: 512,64 format: RGBA8888 filter: Nearest,Nearest repeat: none button rotate: false xy: 2, 2 - size: 52, 40 - split: 24, 24, 12, 24 - orig: 52, 40 + size: 52, 52 + split: 24, 24, 12, 22 + orig: 52, 52 + offset: 0, 0 + index: -1 +button.disabled + rotate: false + xy: 56, 2 + size: 52, 52 + split: 24, 24, 12, 22 + orig: 52, 52 + offset: 0, 0 + index: -1 +button.hover + rotate: false + xy: 110, 2 + size: 52, 52 + split: 24, 24, 12, 22 + orig: 52, 52 offset: 0, 0 index: -1 button.pressed rotate: false - xy: 56, 2 - size: 52, 40 - split: 24, 24, 16, 20 - orig: 52, 40 + xy: 164, 2 + size: 52, 52 + split: 24, 24, 16, 16 + orig: 52, 52 offset: 0, 0 index: -1 screenshot-image-button rotate: false - xy: 162, 22 + xy: 248, 34 size: 20, 20 split: 8, 8, 8, 8 orig: 20, 20 @@ -30,7 +46,7 @@ screenshot-image-button index: -1 screenshot-image-button-active rotate: false - xy: 140, 22 + xy: 218, 4 size: 20, 20 split: 8, 8, 8, 8 orig: 20, 20 @@ -38,7 +54,7 @@ screenshot-image-button-active index: -1 scroll-slider rotate: false - xy: 184, 22 + xy: 270, 34 size: 20, 20 split: 8, 8, 8, 8 orig: 20, 20 @@ -46,7 +62,7 @@ scroll-slider index: -1 slider rotate: false - xy: 206, 22 + xy: 292, 34 size: 20, 20 split: 8, 8, 8, 8 orig: 20, 20 @@ -54,14 +70,14 @@ slider index: -1 slider-bar rotate: false - xy: 110, 14 + xy: 218, 26 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 slider-bar-hover rotate: false - xy: 110, 14 + xy: 218, 26 size: 28, 28 orig: 28, 28 offset: 0, 0 diff --git a/desktop/resources/ui/ui.json b/desktop/resources/ui/ui.json index feaca2cc..aa84e573 100644 --- a/desktop/resources/ui/ui.json +++ b/desktop/resources/ui/ui.json @@ -1,10 +1,10 @@ { com.badlogic.gdx.graphics.g2d.BitmapFont: { default-font: { file: ego/font.fnt }, button-font: { file: ego/button-font.fnt }} com.badlogic.gdx.graphics.Color: { - button-font-up: {hex: A97F55FF }, - gray: { a: 1, b: 0.5, g: 0.5, r: 0.5}, - pressed: { hex: A97F55FF }, - yellow: {hex: A97F55FF}, + button-font-up: {hex: 19003Dff }, + gray: {hex: 21172Eff }, + pressed: { hex: 19003Dff }, + yellow: {hex: 69386Dff }, }, com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: { default-horizontal: { background: slider, knob: slider-bar } @@ -22,7 +22,7 @@ com.badlogic.gdx.scenes.scene2d.ui.ImageButton$ImageButtonStyle: { com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: { - default: { font: button-font, down: button.pressed, up: button, fontColor: button-font-up, overFontColor: yellow, unpressedOffsetY: 0, pressedOffsetY: -4, downFontColor: pressed, disabledFontColor: gray} + default: { font: button-font, disabled: button.disabled, down: button.pressed, over: button.hover, up: button, fontColor: button-font-up, overFontColor: yellow, unpressedOffsetY: 0, pressedOffsetY: -4, downFontColor: pressed, disabledFontColor: gray} } diff --git a/desktop/resources/ui/ui.png b/desktop/resources/ui/ui.png index 1233f676..6102ea8d 100644 Binary files a/desktop/resources/ui/ui.png and b/desktop/resources/ui/ui.png differ diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 6ee992a6..0006b32b 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -127,7 +127,7 @@ (defn button-style [] (let [style (skin! (skin "ui/ui.json") :get TextButton$TextButtonStyle) tx (-> style .font .getRegion .getTexture)] - #_(call! ^Texture tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear) + (call! ^Texture tx :set-filter Texture$TextureFilter/Linear Texture$TextureFilter/Linear) style)) (defn save-object [a]