From d473ddfa4949799e4bfa7cb08a6125370dcba941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Hord=C3=A9?= Date: Mon, 4 Jul 2016 16:11:08 +0200 Subject: [PATCH] visual: ajout du style descriptif et une couleur non modifiable --- android/assets/textures/level.json | 1 - android/assets/textures/ui.json | 16 +++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/android/assets/textures/level.json b/android/assets/textures/level.json index 27ce8e0..f0d73a7 100644 --- a/android/assets/textures/level.json +++ b/android/assets/textures/level.json @@ -239,7 +239,6 @@ info_nom: { font : Vademecum-18 } } com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: { - Descriptif: { font : OpenDyslexicAlta-20 , fontColor:white} info_desc: { font : OpenDyslexicAlta-20 , fontColor:white} info_tooltip: { font : OpenDyslexicAlta-18 , fontColor:white} } diff --git a/android/assets/textures/ui.json b/android/assets/textures/ui.json index 55b51df..8572e73 100644 --- a/android/assets/textures/ui.json +++ b/android/assets/textures/ui.json @@ -1,8 +1,12 @@ { -com.badlogic.gdx.graphics.g2d.BitmapFont: { default-font: { file: fonts/OpenDyslexicAlta-22.fnt } }, +com.badlogic.gdx.graphics.g2d.BitmapFont: { +default-font: { file: fonts/OpenDyslexicAlta-22.fnt } +OpenDyslexicAlta-20: { file: fonts/OpenDyslexicAlta-20.fnt } + }, com.badlogic.gdx.graphics.Color: { green: { a: 1, b: 0, g: 1, r: 0 }, white: { a: 1, b: 1, g: 1, r: 1 }, + fixedwhite: { a: 1, b: 1, g: 1, r: 1 }, red: { a: 1, b: 0, g: 0, r: 1 }, grey: { a: 1, b: 0.75, g: 0.75, r: 0.75 }, lowgrey: { a: 1, b: 0.25, g: 0.25, r: 0.25 }, @@ -17,9 +21,9 @@ com.badlogic.gdx.scenes.scene2d.ui.Button$ButtonStyle: { toggle: { down: default-round-down, checked: default-round-down, up: default-round } }, com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle: { - default: { down: default-round-down, up: default-round, font: default-font, fontColor: white, disabledFontColor:lowgrey }, - checkable: { down: default-round-down, up: default-round, checked: default-round-red, font: default-font, fontColor: white, disabledFontColor:lowgrey }, - toggle: { down: default-round-down, up: default-round, checked: default-round-down, font: default-font, fontColor: white, + default: { down: default-round-down, up: default-round, font: default-font, fontColor: fixedwhite, disabledFontColor:lowgrey }, + checkable: { down: default-round-down, up: default-round, checked: default-round-red, font: default-font, fontColor: fixedwhite, disabledFontColor:lowgrey }, + toggle: { down: default-round-down, up: default-round, checked: default-round-down, font: default-font, fontColor: fixedwhite, downFontColor: red } }, com.badlogic.gdx.scenes.scene2d.ui.ScrollPane$ScrollPaneStyle: { @@ -49,7 +53,9 @@ com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: { grey: { font: default-font, fontColor: grey } }, com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: { - default: { selection: selection, background: textfield, font: default-font, fontColor: white, cursor: cursor } + default: { selection: selection, background: textfield, font: default-font, fontColor: white, cursor: cursor }, + transparent: { selection: selection, font: default-font, fontColor: white, cursor: cursor }, + descriptif: { selection: selection, font: OpenDyslexicAlta-20, fontColor: fixedwhite, cursor: cursor } }, com.badlogic.gdx.scenes.scene2d.ui.CheckBox$CheckBoxStyle: { default: { checkboxOn: check-on, checkboxOff: check-off, font: default-font, fontColor: white }