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

The img "escapes" should now correctly deal with HiDPI

Browse Source
This commit is contained in:
Scoopta 2020-07-18 02:00:09 -07:00
parent 00decaa9a1
commit e7672ff694
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/wofi.c
View File

@ -212,6 +212,7 @@ static gboolean do_search(gpointer data) {
return G_SOURCE_CONTINUE; return G_SOURCE_CONTINUE;
} }
//This is hideous, why did I do this to myself
static char* parse_images(WofiPropertyBox* box, const char* text, bool create_widgets) { static char* parse_images(WofiPropertyBox* box, const char* text, bool create_widgets) {
char* ret = strdup(""); char* ret = strdup("");
struct map* mode_map = map_init(); struct map* mode_map = map_init();
@ -290,9 +291,14 @@ static char* parse_images(WofiPropertyBox* box, const char* text, bool create_wi
goto done; goto done;
} }
buf = utils_g_resize_pixbuf(buf, image_size, GDK_INTERP_BILINEAR); buf = utils_g_resize_pixbuf(buf, image_size * wofi_get_window_scale(), GDK_INTERP_BILINEAR);
GtkWidget* img = gtk_image_new();
cairo_surface_t* surface = gdk_cairo_surface_create_from_pixbuf(buf, wofi_get_window_scale(), gtk_widget_get_window(img));
gtk_image_set_from_surface(GTK_IMAGE(img), surface);
cairo_surface_destroy(surface);
g_object_unref(buf);
GtkWidget* img = gtk_image_new_from_pixbuf(buf);
gtk_widget_set_name(img, "img"); gtk_widget_set_name(img, "img");
gtk_container_add(GTK_CONTAINER(box), img); gtk_container_add(GTK_CONTAINER(box), img);
} else if(strcmp(mode, "img-noscale") == 0 && create_widgets) { } else if(strcmp(mode, "img-noscale") == 0 && create_widgets) {
@ -301,7 +307,13 @@ static char* parse_images(WofiPropertyBox* box, const char* text, bool create_wi
fprintf(stderr, "Image %s cannot be loaded\n", str); fprintf(stderr, "Image %s cannot be loaded\n", str);
goto done; goto done;
} }
GtkWidget* img = gtk_image_new_from_pixbuf(buf);
GtkWidget* img = gtk_image_new();
cairo_surface_t* surface = gdk_cairo_surface_create_from_pixbuf(buf, wofi_get_window_scale(), gtk_widget_get_window(img));
gtk_image_set_from_surface(GTK_IMAGE(img), surface);
cairo_surface_destroy(surface);
g_object_unref(buf);
gtk_widget_set_name(img, "img"); gtk_widget_set_name(img, "img");
gtk_container_add(GTK_CONTAINER(box), img); gtk_container_add(GTK_CONTAINER(box), img);
} else if(strcmp(mode, "img-base64") == 0 && create_widgets) { } else if(strcmp(mode, "img-base64") == 0 && create_widgets) {
@ -313,7 +325,12 @@ static char* parse_images(WofiPropertyBox* box, const char* text, bool create_wi
buf = utils_g_resize_pixbuf(buf, image_size, GDK_INTERP_BILINEAR); buf = utils_g_resize_pixbuf(buf, image_size, GDK_INTERP_BILINEAR);
GtkWidget* img = gtk_image_new_from_pixbuf(buf); GtkWidget* img = gtk_image_new();
cairo_surface_t* surface = gdk_cairo_surface_create_from_pixbuf(buf, wofi_get_window_scale(), gtk_widget_get_window(img));
gtk_image_set_from_surface(GTK_IMAGE(img), surface);
cairo_surface_destroy(surface);
g_object_unref(buf);
gtk_widget_set_name(img, "img"); gtk_widget_set_name(img, "img");
gtk_container_add(GTK_CONTAINER(box), img); gtk_container_add(GTK_CONTAINER(box), img);
} else if(strcmp(mode, "img-base64-noscale") == 0 && create_widgets) { } else if(strcmp(mode, "img-base64-noscale") == 0 && create_widgets) {
@ -322,7 +339,12 @@ static char* parse_images(WofiPropertyBox* box, const char* text, bool create_wi
fprintf(stderr, "base64 image cannot be loaded\n"); fprintf(stderr, "base64 image cannot be loaded\n");
goto done; goto done;
} }
GtkWidget* img = gtk_image_new_from_pixbuf(buf); GtkWidget* img = gtk_image_new();
cairo_surface_t* surface = gdk_cairo_surface_create_from_pixbuf(buf, wofi_get_window_scale(), gtk_widget_get_window(img));
gtk_image_set_from_surface(GTK_IMAGE(img), surface);
cairo_surface_destroy(surface);
g_object_unref(buf);
gtk_widget_set_name(img, "img"); gtk_widget_set_name(img, "img");
gtk_container_add(GTK_CONTAINER(box), img); gtk_container_add(GTK_CONTAINER(box), img);
} else if(strcmp(mode, "text") == 0) { } else if(strcmp(mode, "text") == 0) {