aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/e-day-view.c
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-07-09 03:16:33 +0800
committerMilan Crha <mcrha@redhat.com>2009-07-09 03:16:33 +0800
commitd11c3c7df839d8bed10c67621fd64613c0b1eb34 (patch)
tree64914b0b6bc1bd0cc843cab2ee94051fb3d0661a /calendar/gui/e-day-view.c
parent1f41451e668dd3c551c215656071499dde0ed41a (diff)
downloadgsoc2013-evolution-d11c3c7df839d8bed10c67621fd64613c0b1eb34.tar.gz
gsoc2013-evolution-d11c3c7df839d8bed10c67621fd64613c0b1eb34.tar.zst
gsoc2013-evolution-d11c3c7df839d8bed10c67621fd64613c0b1eb34.zip
Bug #238058 - Show more from summary for events with icons
- do not show icons when editing event summary inline and the text is above them - move text right to icons as before when the text is on the same line as icons are
Diffstat (limited to 'calendar/gui/e-day-view.c')
-rw-r--r--calendar/gui/e-day-view.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 6099a7df5f..bcd6d42c23 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -4685,6 +4685,10 @@ e_day_view_reshape_day_event (EDayView *day_view,
if (num_icons > 0) {
if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD) * num_icons)
icons_offset = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD * 2;
+ else if (item_h <= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD) * 2 || num_icons == 1)
+ icons_offset = (E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD) * num_icons + E_DAY_VIEW_ICON_X_PAD;
+ else
+ icons_offset = E_DAY_VIEW_ICON_X_PAD;
}
if (!event->canvas_item) {