← Back to branch summary

~gary-wzl77/ubuntu-calendar-app/show-week-number

« back to all changes in this revision

Viewing changes to TimeLineHeaderComponent.qml

  • Committer: Tarmac
  • Author(s): Kunal Parmar
  • Date: 2015-09-10 13:04:16 UTC
  • mfrom: (711.1.2 ubuntu-calendar-app)
  • Revision ID: tarmac-20150910130416-swxlwr0o3oxqybxz
resolves Bug #1475747 . Fixes: https://bugs.launchpad.net/bugs/1475747.

Approved by Mihir Soni, Ubuntu Phone Apps Jenkins Bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
TimeLineHeaderComponent.qml
31
31
    property var currentDay
32
32
 
33
33
    property int highlightedIndex;
 
34
    property var selectedDay;
34
35
 
35
36
    signal dateSelected(var date);
 
37
    signal dateHighlighted(var date);
36
38
 
37
39
    width: parent.width
38
40
    height: units.gu(4)
39
41
 
 
42
    function findSelectedDayIndex() {
 
43
        if(!selectedDay){
 
44
            return -1;
 
45
        }
 
46
        return DateExt.daysBetween(startDay, selectedDay);
 
47
    }
 
48
 
40
49
    onIsCurrentItemChanged: {
41
50
        highlightedIndex = -1
42
51
    }
43
52
 
 
53
    onSelectedDayChanged: {
 
54
        if(isCurrentItem){
 
55
            highlightedIndex = findSelectedDayIndex()
 
56
        }
 
57
    }
 
58
 
44
59
    Repeater{
45
60
        model: type == ViewType.ViewTypeWeek ? 7 : 1
46
61
 
47
62
        delegate: HeaderDateComponent{
48
63
            date: type == ViewType.ViewTypeWeek ? startDay.addDays(index) : startDay
49
64
            dayFormat: Locale.ShortFormat
50
 
            highlighted: (type == ViewType.ViewTypeWeek) && (highlightedIndex == index)
 
65
            highlighted: (type == ViewType.ViewTypeWeek) && (highlightedIndex === index)
51
66
 
52
67
            dayColor: {
53
68
                if( type == ViewType.ViewTypeWeek && date.isSameDay(DateExt.today())){
54
 
                    header.highlightedIndex = index
 
69
                    //header.highlightedIndex = index
55
70
                    UbuntuColors.orange
56
71
                } /*else if( type == ViewType.ViewTypeDay && date.isSameDay(currentDay) ) {
57
72
                    UbuntuColors.orange
71
86
                        header.dateSelected(date);
72
87
                    } else {
73
88
                        header.highlightedIndex = index
 
89
                        header.dateHighlighted(date);
74
90
                    }
75
91
                }
76
92
            }