talons

commit a8abb54919b9bff83a293384a3515ad773848d88
parent e178a14c652422b91c33f0788fad7a05420ebfd9
Author: Paul <paul@claws-mail.org>
Date:   Fri, 31 Mar 2023 18:07:31 +0100

fix image viewer when not auto-loading images: fix alignments of text; show the 'load' button; re-arrange the code in a more linear fashion

Diffstat:
M
src/image_viewer.c
 | 
22
+++++++++++++---------

1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/image_viewer.c b/src/image_viewer.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
+ * Copyright (C) 1999-2023 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -316,11 +316,6 @@ static MimeViewer *image_viewer_create(void)
 	gtk_label_set_xalign(GTK_LABEL(label3), 0.0);
 	gtk_grid_attach(GTK_GRID(table1), label3, 0, 0, 2, 1);
 
-	label4 = gtk_label_new(_("Filesize:"));
-	gtk_widget_show(label4);
-	gtk_label_set_xalign(GTK_LABEL(label4), 0.0);
-	gtk_grid_attach(GTK_GRID(table1), label4, 0, 1, 1, 1);
-
 	filename = gtk_label_new("");
 	gtk_widget_show(filename);
 	gtk_label_set_xalign(GTK_LABEL(filename), 0.0);
@@ -328,10 +323,15 @@ static MimeViewer *image_viewer_create(void)
 	gtk_widget_set_hexpand(filename, TRUE);
 	gtk_widget_set_halign(filename, GTK_ALIGN_FILL);
 
+	label4 = gtk_label_new(_("Filesize:"));
+	gtk_widget_show(label4);
+	gtk_label_set_xalign(GTK_LABEL(label4), 0.0);
+	gtk_grid_attach(GTK_GRID(table1), label4, 0, 1, 2, 1);
+
 	filesize = gtk_label_new("");
 	gtk_widget_show(filesize);
 	gtk_label_set_xalign(GTK_LABEL(filesize), 0.0);
-	gtk_grid_attach(GTK_GRID(table1), filesize, 1, 1, 1, 1);
+	gtk_grid_attach(GTK_GRID(table1), filesize, 1, 1, 2, 1);
 	gtk_widget_set_hexpand(filesize, TRUE);
 	gtk_widget_set_halign(filesize, GTK_ALIGN_FILL);
 
@@ -339,11 +339,13 @@ static MimeViewer *image_viewer_create(void)
 	gtk_widget_show(label5);
 	gtk_label_set_xalign(GTK_LABEL(label5), 0.0);
 	gtk_grid_attach(GTK_GRID(table1), label5, 0, 2, 2, 1);
+	gtk_widget_set_hexpand(label5, TRUE);
+	gtk_widget_set_halign(label5, GTK_ALIGN_FILL);
 
 	content_type = gtk_label_new("");
 	gtk_widget_show(content_type);
 	gtk_label_set_xalign(GTK_LABEL(content_type), 0.0);
-	gtk_grid_attach(GTK_GRID(table1), content_type, 1, 2, 1, 1);
+	gtk_grid_attach(GTK_GRID(table1), content_type, 1, 2, 2, 1);
 	gtk_widget_set_hexpand(content_type, TRUE);
 	gtk_widget_set_halign(content_type, GTK_ALIGN_FILL);
 
@@ -357,7 +359,7 @@ static MimeViewer *image_viewer_create(void)
 	error_msg = gtk_label_new("");
 	gtk_widget_show(error_msg);
 	gtk_label_set_xalign(GTK_LABEL(error_msg), 0.0);
-	gtk_grid_attach(GTK_GRID(table1), error_msg, 1, 3, 1, 1);
+	gtk_grid_attach(GTK_GRID(table1), error_msg, 1, 3, 2, 1);
 	gtk_widget_set_hexpand(error_msg, TRUE);
 	gtk_widget_set_halign(error_msg, GTK_ALIGN_FILL);
 
@@ -365,6 +367,8 @@ static MimeViewer *image_viewer_create(void)
 	gtk_widget_show(load_button);
 	gtk_widget_set_size_request(GTK_WIDGET(load_button), 6, -1);
 	gtk_grid_attach(GTK_GRID(table1), load_button, 0, 4, 1, 1);
+	gtk_widget_set_hexpand(load_button, FALSE);
+	gtk_widget_set_halign(load_button, GTK_ALIGN_FILL);
 
 	scrolledwin = gtk_scrolled_window_new(NULL, NULL);
 	gtk_widget_show(scrolledwin);