TnSb/wofi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaked --lines code. Hopefully it's more reliable now

Browse Source
This commit is contained in:
Scoopta 2020-02-25 00:30:35 -08:00
parent f7b599fe6f
commit 6961672701
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/wofi.c
View File

@ -68,7 +68,7 @@ static uint64_t columns;
static bool user_moved = false; static bool user_moved = false;
static uint16_t widget_count = 0; static uint16_t widget_count = 0;
static enum sort_order sort_order; static enum sort_order sort_order;
static int64_t min_height = INT64_MAX; static int64_t max_height = 0;
static uint64_t lines; static uint64_t lines;
static int8_t line_wrap; static int8_t line_wrap;
@ -387,17 +387,33 @@ static void expand(GtkExpander* expander, gpointer data) {
} }
static void widget_allocate(GtkWidget* widget, GdkRectangle* allocation, gpointer data) { static void widget_allocate(GtkWidget* widget, GdkRectangle* allocation, gpointer data) {
(void) widget;
(void) data; (void) data;
min_height = utils_min(min_height, allocation->height); if(max_height > 0) {
if(allocation->height > max_height) {
int64_t ratio = allocation->height / max_height;
int64_t mod = allocation->height % max_height;
if(mod >= max_height / 2) {
++ratio;
}
if(ratio > 1) {
gtk_widget_set_size_request(widget, width, max_height * ratio);
} else {
max_height = allocation->height;
}
} else {
gtk_widget_set_size_request(widget, width, max_height);
}
} else {
max_height = allocation->height;
}
if(wl != NULL) { if(wl != NULL) {
zwlr_layer_surface_v1_set_size(wlr_surface, width, min_height * lines); zwlr_layer_surface_v1_set_size(wlr_surface, width, max_height * lines);
wl_surface_commit(wl_surface); wl_surface_commit(wl_surface);
wl_display_roundtrip(wl); wl_display_roundtrip(wl);
} }
gtk_window_resize(GTK_WINDOW(window), width, min_height * lines); gtk_window_resize(GTK_WINDOW(window), width, max_height * lines);
gtk_widget_set_size_request(scroll, width, min_height * lines); gtk_widget_set_size_request(scroll, width, max_height * lines);
} }
static gboolean _insert_widget(gpointer data) { static gboolean _insert_widget(gpointer data) {