mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2024-12-24 14:06:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

separating value

Browse source
This commit is contained in:
Tanasart 2024-07-03 10:32:12 +07:00
parent b8f12c43b7
commit 87295a5f88
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/nodeValue_drawer/nodeValue_drawer.gml
View file

@ -320,6 +320,7 @@ function drawWidget(xx, yy, ww, _m, jun, global_var = true, _hover = false, _foc
var _show = jun.showValue(); var _show = jun.showValue();
var param = new widgetParam(editBoxX, editBoxY, editBoxW, editBoxH, _show, jun.display_data, _m, rx, ry); var param = new widgetParam(editBoxX, editBoxY, editBoxW, editBoxH, _show, jun.display_data, _m, rx, ry);
param.font = viewMode == INSP_VIEW_MODE.spacious? f_p0 : f_p2; param.font = viewMode == INSP_VIEW_MODE.spacious? f_p0 : f_p2;
param.sep_axis = jun.sep_axis;
switch(jun.type) { switch(jun.type) {
case VALUE_TYPE.float : case VALUE_TYPE.float :

5
scripts/textBox/textBox.gml
View file

@ -32,7 +32,8 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor {
slider_def_val = 0; slider_def_val = 0;
slider_cur_val = 0; slider_cur_val = 0;
label = ""; label = "";
labelColor = COLORS._main_text_sub;
highlight_color = -1; highlight_color = -1;
highlight_alpha = 1; highlight_alpha = 1;
@ -501,7 +502,7 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor {
draw_sprite_ui_uniform(THEME.arrow, 0, _ax1, _ay, 1, COLORS._main_accent, 1); draw_sprite_ui_uniform(THEME.arrow, 0, _ax1, _ay, 1, COLORS._main_accent, 1);
} else if(label != "") { } else if(label != "") {
draw_set_text(font, fa_left, fa_center, COLORS._main_text_sub); draw_set_text(font, fa_left, fa_center, labelColor);
draw_set_alpha(0.5); draw_set_alpha(0.5);
draw_text_add(_x + padding, _y + _h / 2, label); draw_text_add(_x + padding, _y + _h / 2, label);

6
scripts/vectorBox/vectorBox.gml
View file

@ -164,8 +164,10 @@ function vectorBox(_size, _onModify, _unit = noone) : widget() constructor {
var by = per_line? _y + (_h + ui(4)) * i : _y; var by = per_line? _y + (_h + ui(4)) * i : _y;
tb[i].setFocusHover(active, hover); tb[i].setFocusHover(active, hover);
tb[i].hide = !per_line; tb[i].labelColor = sep_axis? COLORS.axis[i] : COLORS._main_text_sub;
tb[i].label = axis[i]; tb[i].hide = !per_line;
tb[i].label = axis[i];
tb[i].draw(bx, by, ww, _h, _data[i], _m); tb[i].draw(bx, by, ww, _h, _data[i], _m);
} }

7
scripts/widget/widget.gml
View file

@ -18,7 +18,8 @@ function widget() constructor {
lua_thread = noone; lua_thread = noone;
lua_thread_key = ""; lua_thread_key = "";
font = f_p0; font = f_p0;
sep_axis = false;
x = 0; x = 0;
y = 0; y = 0;
@ -49,6 +50,8 @@ function widget() constructor {
font = params.font; font = params.font;
rx = params.rx; rx = params.rx;
ry = params.ry; ry = params.ry;
sep_axis = params.sep_axis;
} #endregion } #endregion
static trigger = function() { } static trigger = function() { }
@ -114,4 +117,6 @@ function widgetParam(x, y, w, h, data, display_data = {}, m = mouse_ui, rx = 0,
self.display_data = display_data; self.display_data = display_data;
self.font = f_p0; self.font = f_p0;
sep_axis = false;
} }