Skip to content

Fix cursor misaligned: add cursor offset #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rexim merged 2 commits into from
Feb 16, 2023
Merged

Fix cursor misaligned: add cursor offset #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ee1d16
Fix cursor misaligned: add cursor offset
mjkloeckner Feb 9, 2023
e28ae54
Merge branch 'master' into cursor_offset
rexim Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#define SCREEN_HEIGHT 600
#define FPS 60
#define DELTA_TIME (1.0f / FPS)
#define CURSOR_OFFSET 0.13f

typedef int Errno;

Expand Down
4 changes: 2 additions & 2 deletions src/editor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ void editor_render(SDL_Window *window, Free_Glyph_Atlas *atlas, Simple_Renderer
}

if (select_begin_chr <= select_end_chr) {
Vec2f select_begin_scr = vec2f(0, -(float)row * FREE_GLYPH_FONT_SIZE);
Vec2f select_begin_scr = vec2f(0, -((float)row + CURSOR_OFFSET) * FREE_GLYPH_FONT_SIZE);
free_glyph_atlas_measure_line_sized(
atlas, editor->data.items + line_chr.begin, select_begin_chr - line_chr.begin,
&select_begin_scr);
Expand Down Expand Up @@ -288,7 +288,7 @@ void editor_render(SDL_Window *window, Free_Glyph_Atlas *atlas, Simple_Renderer
size_t cursor_row = editor_cursor_row(editor);
Line line = editor->lines.items[cursor_row];
size_t cursor_col = editor->cursor - line.begin;
cursor_pos.y = -(float) cursor_row * FREE_GLYPH_FONT_SIZE;
cursor_pos.y = -((float)cursor_row + CURSOR_OFFSET) * FREE_GLYPH_FONT_SIZE;
cursor_pos.x = free_glyph_atlas_cursor_pos(
atlas,
editor->data.items + line.begin, line.end - line.begin,
Expand Down
2 changes: 1 addition & 1 deletion src/file_browser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void fb_render(const File_Browser *fb, SDL_Window *window, Free_Glyph_Atlas *atl

simple_renderer_set_shader(sr, SHADER_FOR_COLOR);
if (fb->cursor < fb->files.count) {
const Vec2f begin = vec2f(0, -(float)fb->cursor * FREE_GLYPH_FONT_SIZE);
const Vec2f begin = vec2f(0, -((float)fb->cursor + CURSOR_OFFSET) * FREE_GLYPH_FONT_SIZE);
Vec2f end = begin;
free_glyph_atlas_measure_line_sized(
atlas, fb->files.items[fb->cursor], strlen(fb->files.items[fb->cursor]),
Expand Down