notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no outline on font on buttons.

Browse Source
This commit is contained in:
Bryce Covert
2015-11-11 09:57:40 -08:00
parent 9b8a851ca5
commit 0488036aa9
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/ego/font1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 37 KiB

BIN
desktop/resources/ego/font2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.0 KiB

10
desktop/resources/ui/ui.json
View File

@@ -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: { 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}, gray: { a: 1, b: 0.5, g: 0.5, r: 0.5},
pressed: { hex: A2A328FF }, pressed: { hex: A97F55FF },
yellow: {hex: B8B914FF}, yellow: {hex: A97F55FF},
}, },
com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: { com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: {
default-horizontal: { background: slider, knob: slider-bar } 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: { 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}
} }

2
desktop/src-common/advent/screens/title.clj
View File

@@ -127,7 +127,7 @@
(defn button-style [] (defn button-style []
(let [style (skin! (skin "ui/ui.json") :get TextButton$TextButtonStyle) (let [style (skin! (skin "ui/ui.json") :get TextButton$TextButtonStyle)
tx (-> style .font .getRegion .getTexture)] 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)) style))
(defn save-object [a] (defn save-object [a]