Align author name and date in commit dialog

This commit is contained in:
Jesse van den Kieboom 2014-01-05 00:27:05 +01:00
parent c1765a6f41
commit 98c1120a62
2 changed files with 21 additions and 5 deletions

View file

@ -297,18 +297,34 @@ class Dialog : Gtk.Dialog
var name = d_author.get_name();
var email = d_author.get_email();
d_label_user.set_label(@"$name <$email>");
var s = @"$name <$email>";
d_label_user.set_label(s);
var rtl = (get_style_context().get_state() & Gtk.StateFlags.DIR_RTL) != 0;
if (rtl == (Pango.find_base_dir(s, -1) != Pango.Direction.RTL))
{
d_label_user.xalign = 1.0f;
}
var t = d_author.get_time();
var now = new DateTime.now_local();
string date_string;
if (now.difference(t) < TimeSpan.SECOND * 5)
{
d_label_date.set_label("");
date_string = "";
}
else
{
d_label_date.set_label((new Gitg.Date.for_date_time(t)).for_display());
date_string = (new Gitg.Date.for_date_time(t)).for_display();
}
d_label_date.set_label(date_string);
if (rtl == (Pango.find_base_dir(date_string, -1) != Pango.Direction.RTL))
{
d_label_date.xalign = 1.0f;
}
var ac = Gitg.AvatarCache.default();

View file

@ -81,9 +81,9 @@
<object class="GtkLabel" id="label_user">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">end</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -96,9 +96,9 @@
<object class="GtkLabel" id="label_date">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">1</property>