twix/raygui
1
0
Fork 0
mirror of https://github.com/raysan5/raygui.git synced 2026-02-02 20:29:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Custom_font WIP

Browse Source
This commit is contained in:
Sergio Martínez
2018-10-16 13:07:34 +02:00
parent 8c9b654fbb
commit 296bc577f5
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/controls_review/controls_review.c
View File

@ -49,6 +49,8 @@ int main()
bool multiTextBoxEditMode = false; bool multiTextBoxEditMode = false;
bool dropDown000EditMode = false; bool dropDown000EditMode = false;
bool dropDown001EditMode = false; bool dropDown001EditMode = false;
//TODO: Substituir DrawText por DrawTextEx y MeasureText por MeasureTextEx
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
SetTargetFPS(60); SetTargetFPS(60);

13
src/raygui.h
View File

@ -124,11 +124,12 @@
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Defines and Macros // Defines and Macros
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
#define NUM_PROPERTIES 155 #define NUM_PROPERTIES 156
#define VALIGN_OFFSET(h) ( (int)h%2) // Vertical alignment for pixel perfect #define VALIGN_OFFSET(h) ((int)h%2) // Vertical alignment for pixel perfect
#define LINE_BLINK_FRAMES 20 #define LINE_BLINK_FRAMES 20
#define DEFAULT_TEXT_PADDING 4 #define DEFAULT_TEXT_PADDING 4
#define DEFAULT_TEXT_LINE_PADDING 5 #define DEFAULT_TEXT_LINE_PADDING 5
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
// Types and Structures Definition // Types and Structures Definition
// NOTE: Some types are required for RAYGUI_STANDALONE usage // NOTE: Some types are required for RAYGUI_STANDALONE usage
@ -180,6 +181,7 @@ typedef enum GuiProperty {
DEFAULT_LINES_COLOR, DEFAULT_LINES_COLOR,
DEFAULT_TEXT_FONT, DEFAULT_TEXT_FONT,
DEFAULT_TEXT_SIZE, DEFAULT_TEXT_SIZE,
DEFAULT_TEXT_SPACING,
DEFAULT_BORDER_WIDTH, DEFAULT_BORDER_WIDTH,
DEFAULT_BORDER_COLOR_NORMAL, DEFAULT_BORDER_COLOR_NORMAL,
DEFAULT_BASE_COLOR_NORMAL, DEFAULT_BASE_COLOR_NORMAL,
@ -358,8 +360,8 @@ typedef enum GuiProperty {
// Global gui modification functions // Global gui modification functions
RAYGUIDEF void GuiEnable(void); // Enable gui controls (global state) RAYGUIDEF void GuiEnable(void); // Enable gui controls (global state)
RAYGUIDEF void GuiDisable(void); // Disable gui controls (global state) RAYGUIDEF void GuiDisable(void); // Disable gui controls (global state)
RAYGUIDEF void GuiLock(void); // Disable gui controls (global state) RAYGUIDEF void GuiLock(void); // Disable gui controls (global state)
RAYGUIDEF void GuiUnlock(void); // Disable gui controls (global state) RAYGUIDEF void GuiUnlock(void); // Disable gui controls (global state)
RAYGUIDEF void GuiFade(float alpha); // Set gui controls alpha (global state), alpha goes from 0.0f to 1.0f RAYGUIDEF void GuiFade(float alpha); // Set gui controls alpha (global state), alpha goes from 0.0f to 1.0f
// Style set/get functions // Style set/get functions
@ -457,6 +459,7 @@ typedef enum GuiControlState {
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
static GuiControlState guiState = NORMAL; static GuiControlState guiState = NORMAL;
static float guiAlpha = 1.0f; static float guiAlpha = 1.0f;
static Font guiFont = { 0 };
// Current GUI style (light or dark) // Current GUI style (light or dark)
static int style[NUM_PROPERTIES] = { static int style[NUM_PROPERTIES] = {
@ -466,6 +469,7 @@ static int style[NUM_PROPERTIES] = {
0x90abb5ff, // DEFAULT_LINES_COLOR 0x90abb5ff, // DEFAULT_LINES_COLOR
0, // DEFAULT_TEXT_FONT 0, // DEFAULT_TEXT_FONT
10, // DEFAULT_TEXT_SIZE 10, // DEFAULT_TEXT_SIZE
0, // DEFAULT_TEXT_SPACING WARNING!!!!!!!!!!!!! need to update rguilayout!!!!
1, // DEFAULT_BORDER_WIDTH 1, // DEFAULT_BORDER_WIDTH
0x838383ff, // DEFAULT_BORDER_COLOR_NORMAL 0x838383ff, // DEFAULT_BORDER_COLOR_NORMAL
0xc9c9c9ff, // DEFAULT_BASE_COLOR_NORMAL 0xc9c9c9ff, // DEFAULT_BASE_COLOR_NORMAL
@ -624,6 +628,7 @@ static int style[NUM_PROPERTIES] = {
0x638465ff, // DEFAULT_LINES_COLOR 0x638465ff, // DEFAULT_LINES_COLOR
0, // DEFAULT_TEXT_FONT 0, // DEFAULT_TEXT_FONT
10, // DEFAULT_TEXT_SIZE 10, // DEFAULT_TEXT_SIZE
0, // DEFAULT_TEXT_SPACING WARNING!!!!!!!!!!!!! need to update rguilayout!!!!
1, // DEFAULT_BORDER_WIDTH 1, // DEFAULT_BORDER_WIDTH
0x60827dff, // DEFAULT_BORDER_COLOR_NORMAL 0x60827dff, // DEFAULT_BORDER_COLOR_NORMAL
0x2c3334ff, // DEFAULT_BASE_COLOR_NORMAL 0x2c3334ff, // DEFAULT_BASE_COLOR_NORMAL