diff --git a/desktop/resources/ego/font1.png b/desktop/resources/ego/font1.png deleted file mode 100644 index f18f0305..00000000 Binary files a/desktop/resources/ego/font1.png and /dev/null differ diff --git a/desktop/resources/ego/font2.png b/desktop/resources/ego/font2.png deleted file mode 100644 index 66576d77..00000000 Binary files a/desktop/resources/ego/font2.png and /dev/null differ diff --git a/desktop/resources/ui/ui.json b/desktop/resources/ui/ui.json index 194fb298..feaca2cc 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 } } + 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: D66B16FF }, + button-font-up: {hex: A97F55FF }, gray: { a: 1, b: 0.5, g: 0.5, r: 0.5}, - pressed: { hex: A2A328FF }, - yellow: {hex: B8B914FF}, + pressed: { hex: A97F55FF }, + yellow: {hex: A97F55FF}, }, 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: default-font, down: button.pressed, up: button, fontColor: button-font-up, overFontColor: yellow, unpressedOffsetY: 0, pressedOffsetY: -4, downFontColor: pressed, disabledFontColor: gray} + default: { font: button-font, down: button.pressed, up: button, fontColor: button-font-up, overFontColor: yellow, unpressedOffsetY: 0, pressedOffsetY: -4, downFontColor: pressed, disabledFontColor: gray} } diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index 0006b32b..6ee992a6 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]