comparison: ui/gtk/image.c
ui/gtk/image.c
- changeset 961
- 687f43736aef
- parent 801
- e096c441e874
- child 962
- 7016bcb8d38b
equal
deleted
inserted
replaced
| 960:e88ca7dfa943 | 961:687f43736aef |
|---|---|
| 65 | 65 |
| 66 UIWIDGET ui_imageviewer_create(UiObject *obj, UiImageViewerArgs *args) { | 66 UIWIDGET ui_imageviewer_create(UiObject *obj, UiImageViewerArgs *args) { |
| 67 GtkWidget *drawingarea = gtk_drawing_area_new(); | 67 GtkWidget *drawingarea = gtk_drawing_area_new(); |
| 68 GtkWidget *toplevel; | 68 GtkWidget *toplevel; |
| 69 GtkWidget *widget = drawingarea; | 69 GtkWidget *widget = drawingarea; |
| 70 | 70 |
| 71 gtk_widget_set_size_request(drawingarea, 100, 100); | 71 if(args->width > 0 || args->height > 0) { |
| 72 int width = args->width; | |
| 73 int height = args->height; | |
| 74 if(width == 0) { | |
| 75 width = -1; | |
| 76 } | |
| 77 if(height == 0) { | |
| 78 height = -1; | |
| 79 } | |
| 80 gtk_widget_set_size_request(drawingarea, width, height); | |
| 81 } else { | |
| 82 gtk_widget_set_size_request(drawingarea, 100, 100); | |
| 83 } | |
| 72 | 84 |
| 73 #if GTK_MAJOR_VERSION < 4 | 85 #if GTK_MAJOR_VERSION < 4 |
| 74 GtkWidget *eventbox = gtk_event_box_new(); | 86 GtkWidget *eventbox = gtk_event_box_new(); |
| 75 gtk_container_add(GTK_CONTAINER(eventbox), drawingarea); | 87 gtk_container_add(GTK_CONTAINER(eventbox), drawingarea); |
| 76 widget = eventbox; | 88 widget = eventbox; |
