Fcalva/JustUI
1
0
Fork 0
mirror of https://git.planet-casio.com/Lephenixnoir/JustUI.git synced 2024-12-28 04:23:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

jfileselect: add a scrollbar option (enabled by default)

Browse source
This commit is contained in:
Lephenixnoir 2022-11-05 20:58:34 +01:00
parent fd9191cc43
commit cfeba2695c
No known key found for this signature in database
GPG key ID: 1BBA026E13FC0495
2 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/justui/jfileselect.h
View file

@ -39,6 +39,8 @@ typedef struct {
bool saveas; bool saveas;
/* Whether we are currently using the input field */ /* Whether we are currently using the input field */
bool input_mode; bool input_mode;
/* Scrollbar with (0 to disable) */
int8_t scrollbar_width;
/* File filter; NULL accepts everything */ /* File filter; NULL accepts everything */
bool (*filter_function)(struct dirent const *entry); bool (*filter_function)(struct dirent const *entry);
@ -113,6 +115,7 @@ bool jfileselect_default_filter(struct dirent const *entry);
/* Trivial properties */ /* Trivial properties */
void jfileselect_set_font(jfileselect *fs, font_t const *font); void jfileselect_set_font(jfileselect *fs, font_t const *font);
void jfileselect_set_line_spacing(jfileselect *fs, int line_spacing); void jfileselect_set_line_spacing(jfileselect *fs, int line_spacing);
void jfileselect_set_scrollbar_width(jfileselect *fs, int scrollbar_width);
void jfileselect_set_show_file_size(jfileselect *fs, bool show_file_size); void jfileselect_set_show_file_size(jfileselect *fs, bool show_file_size);
#endif /* _J_JFILESELECT */ #endif /* _J_JFILESELECT */

33
src/jfileselect.c
View file

@ -65,8 +65,10 @@ jfileselect *jfileselect_create(void *parent)
#ifdef FX9860G #ifdef FX9860G
fs->line_spacing = 1; fs->line_spacing = 1;
fs->scrollbar_width = 1;
#else #else
fs->line_spacing = 4; fs->line_spacing = 4;
fs->scrollbar_width = 2;
#endif #endif
fs->font = dfont_default(); fs->font = dfont_default();
@ -134,6 +136,11 @@ void jfileselect_set_line_spacing(jfileselect *fs, int line_spacing)
count_visible_lines(fs); count_visible_lines(fs);
} }
void jfileselect_set_scrollbar_width(jfileselect *fs, int scrollbar_width)
{
fs->scrollbar_width = scrollbar_width;
}
void jfileselect_set_show_file_size(jfileselect *fs, bool show_file_size) void jfileselect_set_show_file_size(jfileselect *fs, bool show_file_size)
{ {
fs->show_file_size = show_file_size; fs->show_file_size = show_file_size;
@ -377,9 +384,15 @@ static void jfileselect_poly_render(void *fs0, int x, int y)
font_t const *old_font = dfont(fs->font); font_t const *old_font = dfont(fs->font);
int line_height = fs->font->line_height + fs->line_spacing; int line_height = fs->font->line_height + fs->line_spacing;
int cw = jwidget_content_width(fs); int cw = jwidget_content_width(fs) - 2 * fs->scrollbar_width;
int ch = jwidget_content_height(fs);
struct fileinfo *finfo = fs->entries; struct fileinfo *finfo = fs->entries;
bool scrollbar =
fs->entry_count > fs->visible_lines
&& fs->scrollbar_width > 0;
int entry_width = cw - (scrollbar ? 2 * fs->scrollbar_width : 0);
for(int i = 0; i < fs->visible_lines && i < fs->entry_count; i++) { for(int i = 0; i < fs->visible_lines && i < fs->entry_count; i++) {
bool selected = (fs->cursor == fs->scroll + i); bool selected = (fs->cursor == fs->scroll + i);
struct fileinfo *info = &finfo[fs->scroll + i]; struct fileinfo *info = &finfo[fs->scroll + i];
@ -398,17 +411,29 @@ static void jfileselect_poly_render(void *fs0, int x, int y)
continue; continue;
} }
if(selected) if(selected) {
drect(x, line_y, x + cw - 1, line_y + line_height - 1, C_BLACK); drect(x, line_y, x + entry_width - 1, line_y + line_height - 1,
C_BLACK);
}
dprint(x+2, text_y, fg, "%s%s", info->name, isfolder ? "/" : ""); dprint(x+2, text_y, fg, "%s%s", info->name, isfolder ? "/" : "");
if(fs->show_file_size && info->size >= 0) { if(fs->show_file_size && info->size >= 0) {
char str[32]; char str[32];
generate_info_string(str, isfolder, info->size); generate_info_string(str, isfolder, info->size);
dtext_opt(x+cw-3, text_y, fg, C_NONE, DTEXT_RIGHT, DTEXT_TOP, str); dtext_opt(x + entry_width - 3, text_y, fg, C_NONE, DTEXT_RIGHT,
DTEXT_TOP, str);
} }
} }
if(scrollbar) {
int sb_y = ch * fs->scroll / fs->entry_count;
int sb_h = ch * fs->visible_lines / fs->entry_count;
drect(x + cw - fs->scrollbar_width, y + sb_y,
x + cw - 1, y + sb_y + sb_h - 1,
C_BLACK);
}
dfont(old_font); dfont(old_font);
} }