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

more slider improvement

Browse source
This commit is contained in:
Tanasart 2024-07-27 09:07:29 +07:00
parent fb2b0b71fc
commit 4f9c076b12
2 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
objects/slider_Slider/Draw_64.gml
View file

@ -37,8 +37,4 @@ if(anim == 0) {
draw_set_color(text.slider_mulp == -2? COLORS._main_text_accent : COLORS._main_icon); draw_set_color(text.slider_mulp == -2? COLORS._main_text_accent : COLORS._main_icon);
draw_text(x + w / 2, y + h + ui(18), string(0.01 * _mulp)); draw_text(x + w / 2, y + h + ui(18), string(0.01 * _mulp));
} }
} }
BLEND_ALPHA
//draw_surface_safe(text.text_surface, x + text.padding, y);
BLEND_NORMAL

44
scripts/textBox/textBox.gml
View file

@ -44,6 +44,7 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor {
_current_text = ""; _current_text = "";
_input_text = ""; _input_text = "";
_input_value = 0;
_last_text = ""; _last_text = "";
current_value = ""; current_value = "";
_disp_text = ""; _disp_text = "";
@ -347,11 +348,42 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor {
draw_set_alpha(0.5 + 0.5 * interactable); draw_set_alpha(0.5 + 0.5 * interactable);
_y += ui(1); //Huh? _y += ui(1); //Huh?
var cc = color; var cc = sliding == 2? COLORS._main_accent : color;
if(sliding == 2) cc = COLORS._main_accent
draw_set_text(font, fa_left, fa_top, cc); draw_set_text(font, fa_left, fa_top, cc);
draw_text_add(_x + disp_x, _y, _text + suffix);
if(input == TEXTBOX_INPUT.number) {
var _tx = string_pos(".", _text);
if(_tx != 0) {
var _wh = string_copy(_text, 1, _tx - 1);
var _dc = string_copy(_text, _tx + 1, string_length(_text) - _tx);
var _wh_w = string_width(_wh);
var _dt_w = string_width(".");
var _tx = _x + disp_x;
if(sliding == 2)
_tx = _w / 2 - _wh_w - padding;
var _inv = _wh == "0" ||_wh == "-0";
draw_set_alpha(0.5 + (!_inv) * 0.5);
draw_text_add(_tx, _y, _wh); _tx += _wh_w;
draw_set_alpha(0.5 + (_inv) * 0.5);
draw_text_add(_tx, _y, "."); _tx += _dt_w;
draw_text_add(_tx, _y, _dc);
} else if(sliding == 2) {
var _wh_w = string_width(_text);
draw_text_add(_w / 2 - _wh_w - padding, _y, _text);
} else
draw_text_add(_x + disp_x, _y, _text + suffix);
} else
draw_text_add(_x + disp_x, _y, _text + suffix);
draw_set_alpha(1); draw_set_alpha(1);
_disp_text = _text; _disp_text = _text;
@ -578,7 +610,8 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor {
if(key_mod_press(CTRL) && slide_snap) _val = value_snap(slider_cur_val, slide_snap); if(key_mod_press(CTRL) && slide_snap) _val = value_snap(slider_cur_val, slide_snap);
if(slide_int) _val = round(_val); if(slide_int) _val = round(_val);
_input_text = string_real(_val); _input_text = string_real(_val);
if(apply()) UNDO_HOLDING = true; if(apply()) UNDO_HOLDING = true;
} }
@ -663,6 +696,7 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor {
cursor_pos_to = disp_x + tx + c_w; cursor_pos_to = disp_x + tx + c_w;
if(cursor_pos_to < _x) if(cursor_pos_to < _x)
disp_x_to += _w - padding * 2; disp_x_to += _w - padding * 2;
if(cursor_pos_to > _x + _w - padding * 2) if(cursor_pos_to > _x + _w - padding * 2)
disp_x_to -= _w - padding * 2; disp_x_to -= _w - padding * 2;