update dependencies
This commit is contained in:
parent
d739893046
commit
a1edff2726
@ -1 +1 @@
|
||||
Subproject commit cd9e3bb36a68c4c3fd8248afe8abc9930e759f38
|
||||
Subproject commit 441e6adc4898bcc081d806bb9b5aeeb2f4f0ab0d
|
||||
2
src/dlib
2
src/dlib
@ -1 +1 @@
|
||||
Subproject commit a97309cb04e0e802047586a5bacbacc9b8e9649b
|
||||
Subproject commit c83ffabce69071a3e7a0af3f26aa420082eeda1f
|
||||
@ -165,8 +165,6 @@ Cycle(EditorCtx* ctx, Inputs* inputs)
|
||||
EditorCtx
|
||||
InitEditorCtx(PlatformWindow* window)
|
||||
{
|
||||
InitFreeType();
|
||||
|
||||
InitUICtx(window);
|
||||
|
||||
EditorCtx ctx = {
|
||||
|
||||
@ -435,8 +435,10 @@ SetScrollOffset(UIPanel* panel)
|
||||
Logf("y %s start %s end %s prev %s", pos.y, panel.start_ln, panel.end_ln, panel.prev_start_ln);
|
||||
}
|
||||
|
||||
Logf("pos %s start %s end %s", pos.y, panel.start_ln, panel.end_ln);
|
||||
if((pos.y < panel.start_ln || pos.y > panel.end_ln))
|
||||
{
|
||||
Logf("1");
|
||||
f32 off = f32(panel.start_ln - panel.prev_start_ln)*TEXT_SIZE;
|
||||
panel.scroll_target += off;
|
||||
panel.prev_start_ln = panel.start_ln;
|
||||
@ -461,7 +463,7 @@ SetScrollOffset(UIPanel* panel)
|
||||
max = panel.scroll_target;
|
||||
}
|
||||
|
||||
panel.scroll_offset = EaseOutQuint(Remap(panel.scroll_offset, min, max, 0.0, 1.0)) * g_delta;
|
||||
panel.scroll_offset = EaseOutQuint(Lerp(min, max, panel.scroll_offset)) * g_delta;
|
||||
|
||||
if(panel.scroll_offset - panel.scroll_target < 0.0009)
|
||||
{
|
||||
@ -532,7 +534,7 @@ Panel(UIPanel* panel)
|
||||
|
||||
StartLineBuffer(&panel.ed.buf, code_view_width);
|
||||
|
||||
//SetScrollOffset(panel);
|
||||
SetScrollOffset(panel);
|
||||
|
||||
U64Vec2 pos = VecPos(&ed.buf);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user