Squashed merge of many commits, including (but not limited to) :

[moonshot-ui.git] / src / moonshot-utils.vala

diff --git a/src/moonshot-utils.vala b/src/moonshot-utils.vala
index 4eaed1f..7846745 100644 (file)
--- a/src/moonshot-utils.vala
+++ b/src/moonshot-utils.vala
@@ -124,7 +124,7 @@ internal void set_atk_relation(Widget widget, Widget target_widget, Atk.Relation
 }
 
 
-internal Widget make_ta_fingerprint_widget(TrustAnchor trust_anchor)
+internal Widget make_ta_fingerprint_widget(string server_cert)
 {
         var fingerprint_label = new Label(_("SHA-256 fingerprint:"));
         fingerprint_label.set_alignment(0, 0.5f);
@@ -135,7 +135,7 @@ internal Widget make_ta_fingerprint_widget(TrustAnchor trust_anchor)
         fingerprint.set_editable(false);
         fingerprint.set_left_margin(3);
         var buffer = fingerprint.get_buffer();
-        buffer.set_text(colonize(trust_anchor.server_cert, 16), -1);
+        buffer.set_text(colonize(server_cert, 16), -1);
         fingerprint.wrap_mode = Gtk.WrapMode.WORD_CHAR;
 
         set_atk_relation(fingerprint_label, fingerprint, Atk.RelationType.LABEL_FOR);
@@ -143,7 +143,7 @@ internal Widget make_ta_fingerprint_widget(TrustAnchor trust_anchor)
         var fingerprint_width_constraint = new ScrolledWindow(null, null);
         fingerprint_width_constraint.set_policy(PolicyType.NEVER, PolicyType.NEVER);
         fingerprint_width_constraint.set_shadow_type(ShadowType.IN);
-        fingerprint_width_constraint.set_size_request(300, 60);
+        fingerprint_width_constraint.set_size_request(360, 60);
         fingerprint_width_constraint.add_with_viewport(fingerprint);
 
         var vbox = new VBox(false, 0);
@@ -173,3 +173,17 @@ internal static string colonize(string input, int bytes_per_line) {
     }
     return result;
 }
+
+static Gdk.Color white;
+static void set_bg_color(Widget w)
+{
+#if OS_WIN32
+
+    if (white == null) {
+        white = make_color(65535, 65535, 65535);
+    }
+
+    w.modify_bg(StateType.NORMAL, white);
+
+#endif
+}