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

Some tweaks

Browse Source
This commit is contained in:
Ray
2018-02-24 20:26:07 +01:00
parent 40735a873c
commit 9837aa652e
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
tools/rGuiLayout/default_light.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 395 B

BIN
tools/rGuiLayout/icons.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

41
tools/rGuiLayout/rguilayout.c
View File

@ -74,8 +74,8 @@ typedef struct {
// Global Variables Definition // Global Variables Definition
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
static char currentPath[256]; // Path to current working folder static char currentPath[256]; // Path to current working folder
static int screenWidth = 1280; static int screenWidth = 800;
static int screenHeight = 720; static int screenHeight = 600;
static GuiControl layout[MAX_GUI_CONTROLS]; static GuiControl layout[MAX_GUI_CONTROLS];
static AnchorControl anchorPoint[MAX_GUI_CONTROLS]; static AnchorControl anchorPoint[MAX_GUI_CONTROLS];
@ -173,23 +173,26 @@ int main()
"COLORPICKER" "COLORPICKER"
}; };
const char *guiControlsCounter[12] = { const char *guiControlsCounter[16] = {
"00", "Control 000",
"01", "Control 001",
"02", "Control 002",
"03", "Control 003",
"04", "Control 004",
"05", "Control 005",
"06", "Control 006",
"07", "Control 007",
"08", "Control 008",
"09", "Control 009",
"10", "Control 010",
"11" "Control 011",
"Control 012",
"Control 013",
"Control 014",
"Control 015",
}; };
GuiLoadStyleImage("default_light.png"); Texture2D texture = LoadTexture("icons.png");
Texture2D texture = LoadTexture("default_light.png");
// Get current directory // Get current directory
// NOTE: Current working directory could not match current executable directory // NOTE: Current working directory could not match current executable directory
@ -579,7 +582,7 @@ int main()
{ {
case LABEL: GuiLabel(defaultRec[selectedTypeDraw], "TEXT SAMPLE"); break; case LABEL: GuiLabel(defaultRec[selectedTypeDraw], "TEXT SAMPLE"); break;
case BUTTON: GuiButton(defaultRec[selectedTypeDraw], "BUTTON"); break; case BUTTON: GuiButton(defaultRec[selectedTypeDraw], "BUTTON"); break;
case IMAGEBUTTON: GuiImageButton(defaultRec[selectedTypeDraw], texture); break; case IMAGEBUTTON: GuiImageButtonEx(defaultRec[selectedTypeDraw], texture , (Rectangle){ 0, 0, texture.width/3, texture.height/6 }, "IMAGE BUTTON"); break;
case TOGGLE: GuiToggleButton(defaultRec[selectedTypeDraw], "TOGGLE", false); break; case TOGGLE: GuiToggleButton(defaultRec[selectedTypeDraw], "TOGGLE", false); break;
case TOGGLEGROUP: GuiToggleGroup(defaultRec[selectedTypeDraw], list, 3, 1); break; case TOGGLEGROUP: GuiToggleGroup(defaultRec[selectedTypeDraw], list, 3, 1); break;
case SLIDER: GuiSlider(defaultRec[selectedTypeDraw], 40, 0, 100); break; case SLIDER: GuiSlider(defaultRec[selectedTypeDraw], 40, 0, 100); break;
@ -602,7 +605,7 @@ int main()
{ {
case LABEL: GuiLabel(layout[i].rec, layout[i].text); break; case LABEL: GuiLabel(layout[i].rec, layout[i].text); break;
case BUTTON: GuiButton(layout[i].rec, layout[i].text); break; case BUTTON: GuiButton(layout[i].rec, layout[i].text); break;
case IMAGEBUTTON: GuiImageButton(layout[i].rec, texture); break; case IMAGEBUTTON: GuiImageButtonEx(defaultRec[selectedTypeDraw], texture , (Rectangle){ 0, 0, texture.width/3, texture.height/6 }, layout[i].text); break;
case TOGGLE: GuiToggleButton(layout[i].rec, layout[i].text, false); break; case TOGGLE: GuiToggleButton(layout[i].rec, layout[i].text, false); break;
case TOGGLEGROUP: GuiToggleGroup(layout[i].rec, list, 3, 1); break; case TOGGLEGROUP: GuiToggleGroup(layout[i].rec, list, 3, 1); break;
case SLIDER: GuiSlider(layout[i].rec, 40, 0, 100); break; case SLIDER: GuiSlider(layout[i].rec, 40, 0, 100); break;