mirror of
https://github.com/Ttanasart-pt/Pixel-Composer.git
synced 2025-01-11 23:06:51 +01:00
- Update localization file.
This commit is contained in:
parent
2308f01ecb
commit
fb2b0b71fc
8 changed files with 84 additions and 22 deletions
Binary file not shown.
|
@ -425,5 +425,14 @@
|
||||||
"panel_driver" : "Driver...",
|
"panel_driver" : "Driver...",
|
||||||
"panel_preview_lock_preview" : "Lock previewing node",
|
"panel_preview_lock_preview" : "Lock previewing node",
|
||||||
|
|
||||||
|
// 1.19
|
||||||
|
"global_variables": "Global Variables",
|
||||||
|
"panel_animation_keyframe_edit": "Edit Value...",
|
||||||
|
"panel_graph_hide_disconnected": "Hide stray junctions",
|
||||||
|
"panel_graph_tunnel": "Create tunnels",
|
||||||
|
"art_by_kenney": "Art by Kenney",
|
||||||
|
"panel_menu_reset_layout": "Reset layout",
|
||||||
|
"panel_graph_toggle_minimap": "Toggle minimap",
|
||||||
|
|
||||||
"" : ""
|
"" : ""
|
||||||
}
|
}
|
|
@ -356,5 +356,21 @@
|
||||||
"packing": "Packing",
|
"packing": "Packing",
|
||||||
"resume" : "Resume",
|
"resume" : "Resume",
|
||||||
|
|
||||||
|
// 1.19
|
||||||
|
"histogram" : "Histogram",
|
||||||
|
"background": "Background",
|
||||||
|
"search": "Search",
|
||||||
|
"welcome_files": "Welcome Files",
|
||||||
|
"palette_mixer": "Palette Mixer",
|
||||||
|
"file_explorer": "File Explorer",
|
||||||
|
"show_avatar" : "Show Avatar",
|
||||||
|
"open_in_explorer" : "Open in explorer",
|
||||||
|
"downloads": "Downloads",
|
||||||
|
"label": "Label",
|
||||||
|
"list": "List",
|
||||||
|
"view_mode": "View mode",
|
||||||
|
"palettes_mixer": "Palettes Mixer",
|
||||||
|
"release_note": "Release note",
|
||||||
|
|
||||||
"" : ""
|
"" : ""
|
||||||
}
|
}
|
Binary file not shown.
|
@ -425,5 +425,14 @@
|
||||||
"panel_driver" : "Driver...",
|
"panel_driver" : "Driver...",
|
||||||
"panel_preview_lock_preview" : "Lock previewing node",
|
"panel_preview_lock_preview" : "Lock previewing node",
|
||||||
|
|
||||||
|
// 1.19
|
||||||
|
"global_variables": "Global Variables",
|
||||||
|
"panel_animation_keyframe_edit": "Edit Value...",
|
||||||
|
"panel_graph_hide_disconnected": "Hide stray junctions",
|
||||||
|
"panel_graph_tunnel": "Create tunnels",
|
||||||
|
"art_by_kenney": "Art by Kenney",
|
||||||
|
"panel_menu_reset_layout": "Reset layout",
|
||||||
|
"panel_graph_toggle_minimap": "Toggle minimap",
|
||||||
|
|
||||||
"" : ""
|
"" : ""
|
||||||
}
|
}
|
|
@ -356,5 +356,21 @@
|
||||||
"packing": "Packing",
|
"packing": "Packing",
|
||||||
"resume" : "Resume",
|
"resume" : "Resume",
|
||||||
|
|
||||||
|
// 1.19
|
||||||
|
"histogram" : "Histogram",
|
||||||
|
"background": "Background",
|
||||||
|
"search": "Search",
|
||||||
|
"welcome_files": "Welcome Files",
|
||||||
|
"palette_mixer": "Palette Mixer",
|
||||||
|
"file_explorer": "File Explorer",
|
||||||
|
"show_avatar" : "Show Avatar",
|
||||||
|
"open_in_explorer" : "Open in explorer",
|
||||||
|
"downloads": "Downloads",
|
||||||
|
"label": "Label",
|
||||||
|
"list": "List",
|
||||||
|
"view_mode": "View mode",
|
||||||
|
"palettes_mixer": "Palettes Mixer",
|
||||||
|
"release_note": "Release note",
|
||||||
|
|
||||||
"" : ""
|
"" : ""
|
||||||
}
|
}
|
|
@ -11,28 +11,34 @@ var _h_bot = clamp(-text.slider_mulp + 1, 1, 2) * ui(18) * anim_prog;
|
||||||
var _y = y - _h_top;
|
var _y = y - _h_top;
|
||||||
var _h = h + _h_top + _h_bot;
|
var _h = h + _h_top + _h_bot;
|
||||||
|
|
||||||
draw_sprite_stretched_ext(THEME.textbox, 3, x, _y, w, _h, COLORS._main_icon, 1);
|
draw_sprite_stretched_ext(THEME.textbox, 3, x, _y, w, _h_top, COLORS._main_icon, 0.9);
|
||||||
draw_sprite_stretched_ext(THEME.textbox, 3, x, y, w, h, c_white, 1);
|
draw_sprite_stretched_ext(THEME.textbox, 3, x, y + h, w, _h_bot, COLORS._main_icon, 0.9);
|
||||||
draw_sprite_stretched_ext(THEME.textbox, 1, x, _y, w, _h, c_white, 1);
|
//draw_sprite_stretched_ext(THEME.textbox, 3, x, y, w, h, c_white, 0.9);
|
||||||
|
draw_sprite_stretched_ext(THEME.textbox, 1, x, _y, w, _h, c_white, 1.0);
|
||||||
|
|
||||||
|
var _mulp = 1;
|
||||||
|
if(key_mod_press(CTRL) && !text.slide_snap) _mulp *= 10;
|
||||||
|
if(key_mod_press(ALT)) _mulp /= 10;
|
||||||
|
|
||||||
|
|
||||||
if(anim == 0) {
|
if(anim == 0) {
|
||||||
draw_set_text(f_p4, fa_center, fa_bottom, text.slider_mulp == 1? COLORS._main_text_accent : COLORS._main_icon);
|
draw_set_text(f_p4, fa_center, fa_bottom, text.slider_mulp == 1? COLORS._main_text_accent : COLORS._main_icon);
|
||||||
draw_text(x + w / 2, y, "x10");
|
draw_text(x + w / 2, y, string(10 * _mulp));
|
||||||
|
|
||||||
if(text.slider_mulp >= 1) {
|
if(text.slider_mulp >= 1) {
|
||||||
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 - ui(18), "x100");
|
draw_text(x + w / 2, y - ui(18), string(100 * _mulp));
|
||||||
}
|
}
|
||||||
|
|
||||||
draw_set_text(f_p4, fa_center, fa_top, text.slider_mulp == -1? COLORS._main_text_accent : COLORS._main_icon);
|
draw_set_text(f_p4, fa_center, fa_top, text.slider_mulp == -1? COLORS._main_text_accent : COLORS._main_icon);
|
||||||
draw_text(x + w / 2, y + h, "x0.1");
|
draw_text(x + w / 2, y + h, string(0.1 * _mulp));
|
||||||
|
|
||||||
if(text.slider_mulp <= -1) {
|
if(text.slider_mulp <= -1) {
|
||||||
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), "x0.01");
|
draw_text(x + w / 2, y + h + ui(18), string(0.01 * _mulp));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BLEND_ALPHA
|
BLEND_ALPHA
|
||||||
draw_surface_safe(text.text_surface, x + text.padding, y);
|
//draw_surface_safe(text.text_surface, x + text.padding, y);
|
||||||
BLEND_NORMAL
|
BLEND_NORMAL
|
|
@ -20,12 +20,13 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor {
|
||||||
slidePen = false;
|
slidePen = false;
|
||||||
slide_delta = 0;
|
slide_delta = 0;
|
||||||
slide_int = false;
|
slide_int = false;
|
||||||
slide_speed = 0.01;
|
slide_speed = 1 / 250;
|
||||||
|
|
||||||
slide_snap = 0;
|
slide_snap = 0;
|
||||||
slide_range = noone;
|
slide_range = noone;
|
||||||
curr_range = [ 0, 1 ];
|
curr_range = [ 0, 1 ];
|
||||||
|
|
||||||
|
slider_dx = 0;
|
||||||
slider_dy = 0;
|
slider_dy = 0;
|
||||||
slider_my = 0;
|
slider_my = 0;
|
||||||
slider_mulp = 0;
|
slider_mulp = 0;
|
||||||
|
@ -514,6 +515,7 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor {
|
||||||
slider_cur_del = 0;
|
slider_cur_del = 0;
|
||||||
|
|
||||||
slidePen = PEN_USE;
|
slidePen = PEN_USE;
|
||||||
|
slider_dx = 0;
|
||||||
slider_dy = 0;
|
slider_dy = 0;
|
||||||
slider_mulp = 0;
|
slider_mulp = 0;
|
||||||
|
|
||||||
|
@ -540,7 +542,10 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor {
|
||||||
if(slider_dy < -160 * (1 + abs(slider_mulp) * .5)) { slider_mulp = clamp(slider_mulp + 1, -2, 2); slider_dy = 0; }
|
if(slider_dy < -160 * (1 + abs(slider_mulp) * .5)) { slider_mulp = clamp(slider_mulp + 1, -2, 2); slider_dy = 0; }
|
||||||
else if(slider_dy > 160 * (1 + abs(slider_mulp) * .5)) { slider_mulp = clamp(slider_mulp - 1, -2, 2); slider_dy = 0; }
|
else if(slider_dy > 160 * (1 + abs(slider_mulp) * .5)) { slider_mulp = clamp(slider_mulp - 1, -2, 2); slider_dy = 0; }
|
||||||
|
|
||||||
if(_mulp != slider_mulp) slider_cur_del = 0;
|
if(_mulp != slider_mulp) {
|
||||||
|
slider_dx = 0;
|
||||||
|
slider_cur_del = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if(mouse_press(mb_right)) { //cancel
|
if(mouse_press(mb_right)) { //cancel
|
||||||
_input_text = string_real(slider_def_val);
|
_input_text = string_real(slider_def_val);
|
||||||
|
@ -553,25 +558,26 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor {
|
||||||
} else {
|
} else {
|
||||||
MOUSE_BLOCK = true;
|
MOUSE_BLOCK = true;
|
||||||
var _s = slide_speed;
|
var _s = slide_speed;
|
||||||
_s *= power(10, slider_mulp);
|
var _sc = power(10, slider_mulp);
|
||||||
|
_s *= _sc;
|
||||||
var _dx = abs(_mdx) > abs(_mdy)? _mdx : -_mdy;
|
|
||||||
|
|
||||||
if(key_mod_press(CTRL) && !slide_snap) _s *= 10;
|
if(key_mod_press(CTRL) && !slide_snap) _s *= 10;
|
||||||
if(key_mod_press(ALT)) _s /= 10;
|
if(key_mod_press(ALT)) _s /= 10;
|
||||||
|
|
||||||
slider_cur_del += _dx;
|
var _slider_cur_val = slider_cur_val;
|
||||||
|
slider_dx += _mdx / w;
|
||||||
|
slider_cur_del += _mdx;
|
||||||
slider_cur_val = slider_def_val + slider_cur_del * _s;
|
slider_cur_val = slider_def_val + slider_cur_del * _s;
|
||||||
|
|
||||||
if(slide_range != noone) slider_cur_val = clamp(slider_cur_val, curr_range[0], curr_range[1]);
|
if(slide_range != noone)
|
||||||
|
slider_cur_val = clamp(slider_cur_val, curr_range[0], curr_range[1]);
|
||||||
var _val = value_snap(slider_cur_val, _s);
|
|
||||||
|
var _val = value_snap(slider_cur_val, _sc / 100);
|
||||||
|
// print($"{_slider_cur_val} > {slider_cur_val} : {curr_range} > {_val} [{_sc / 100}]");
|
||||||
|
|
||||||
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);
|
||||||
|
|
||||||
if(abs(_val) < _s * 4) _val = 0;
|
|
||||||
|
|
||||||
_input_text = string_real(_val);
|
_input_text = string_real(_val);
|
||||||
if(apply()) UNDO_HOLDING = true;
|
if(apply()) UNDO_HOLDING = true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue