[haiku-commits] r41933 - in haiku/trunk: headers/private/shared src/kits/shared

From: leavengood@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sun, 5 Jun 2011 08:09:55 +0200 (CEST)
Author: leavengood
Date: 2011-06-05 08:09:55 +0200 (Sun, 05 Jun 2011)
New Revision: 41933
Changeset: https://dev.haiku-os.org/changeset/41933

Modified:
   haiku/trunk/headers/private/shared/CalendarView.h
   haiku/trunk/src/kits/shared/CalendarView.cpp
Log:
Missed this in my previous Time commit, hence the build break, sorry!


Modified: haiku/trunk/headers/private/shared/CalendarView.h
===================================================================
--- haiku/trunk/headers/private/shared/CalendarView.h   2011-06-05 04:58:53 UTC 
(rev 41932)
+++ haiku/trunk/headers/private/shared/CalendarView.h   2011-06-05 06:09:55 UTC 
(rev 41933)
@@ -36,6 +36,9 @@
                                                                
BCalendarView(BRect frame, const char *name, week_start start,
                                                                        uint32 
resizeMask = B_FOLLOW_LEFT | B_FOLLOW_TOP,
                                                                        uint32 
flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE);
+                                                               
+                                                               
BCalendarView(const char* name,
+                                                                       uint32 
flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE);
 
                virtual                                 ~BCalendarView();
 
@@ -88,6 +91,10 @@
 
                virtual void                    ResizeToPreferred();
                virtual void                    GetPreferredSize(float *width, 
float *height);
+               
+               virtual BSize                   MaxSize();
+               virtual BSize                   MinSize();
+               virtual BSize                   PreferredSize();
 
                int32                                   Day() const;
                int32                                   Year() const;

Modified: haiku/trunk/src/kits/shared/CalendarView.cpp
===================================================================
--- haiku/trunk/src/kits/shared/CalendarView.cpp        2011-06-05 04:58:53 UTC 
(rev 41932)
+++ haiku/trunk/src/kits/shared/CalendarView.cpp        2011-06-05 06:09:55 UTC 
(rev 41933)
@@ -11,6 +11,7 @@
 
 #include <stdlib.h>
 
+#include <LayoutUtils.h>
 #include <Window.h>
 
 
@@ -72,6 +73,24 @@
 }
 
 
+BCalendarView::BCalendarView(const char* name, uint32 flags)
+       :
+       BView(name, flags),
+       BInvoker(),
+       fSelectionMessage(NULL),
+       fDay(0),
+       fYear(0),
+       fMonth(0),
+       fFocusChanged(false),
+       fSelectionChanged(false),
+       fWeekStart(B_WEEK_START_SUNDAY),
+       fDayNameHeaderVisible(true),
+       fWeekNumberHeaderVisible(true)
+{
+       _InitObject();
+}
+
+
 BCalendarView::~BCalendarView()
 {
        SetSelectionMessage(NULL);
@@ -559,6 +578,32 @@
 }
 
 
+BSize
+BCalendarView::MaxSize()
+{
+       return BLayoutUtils::ComposeSize(ExplicitMaxSize(),
+               BSize(B_SIZE_UNLIMITED, B_SIZE_UNLIMITED));
+}
+
+
+BSize
+BCalendarView::MinSize()
+{
+       float width, height;
+       _GetPreferredSize(&width, &height);
+       return BLayoutUtils::ComposeSize(ExplicitMinSize(),
+               BSize(width, height));
+}
+
+
+BSize
+BCalendarView::PreferredSize()
+{
+       return BLayoutUtils::ComposeSize(ExplicitPreferredSize(),
+               MinSize());
+}
+
+
 int32
 BCalendarView::Day() const
 {
[haiku-commits] r41933 - in haiku/trunk: headers/private/shared src/kits/shared

Other related posts:
