i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup: respect 80-chars line length limit

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42698 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2011-08-28 10:15:41 +00:00
parent 1e07062b40
commit 87663db420
2 changed files with 66 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/shared/CalendarView.h
+44 -22
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2007-2008, Haiku, Inc. All Rights Reserved. * Copyright 2007-2011, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _CALENDAR_VIEW_H_ #ifndef _CALENDAR_VIEW_H_
@@ -30,24 +30,32 @@ enum week_start {
class BCalendarView : public BView, public BInvoker { class BCalendarView : public BView, public BInvoker {
public: public:
BCalendarView(BRect frame, const char *name, BCalendarView(BRect frame, const char *name,
uint32 resizeMask = B_FOLLOW_LEFT | B_FOLLOW_TOP, uint32 resizeMask = B_FOLLOW_LEFT
uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE); | B_FOLLOW_TOP,
uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS
| B_NAVIGABLE);
BCalendarView(BRect frame, const char *name, week_start start, BCalendarView(BRect frame, const char *name,
uint32 resizeMask = B_FOLLOW_LEFT | B_FOLLOW_TOP, week_start start,
uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE); uint32 resizeMask = B_FOLLOW_LEFT
| B_FOLLOW_TOP,
uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS
| B_NAVIGABLE);
BCalendarView(const char* name, BCalendarView(const char* name,
uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE); uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS
| B_NAVIGABLE);
BCalendarView(const char* name, week_start start, BCalendarView(const char* name,
uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE); week_start start, uint32 flags = B_WILL_DRAW
| B_FRAME_EVENTS | B_NAVIGABLE);
virtual ~BCalendarView(); virtual ~BCalendarView();
BCalendarView(BMessage *archive); BCalendarView(BMessage *archive);
static BArchivable* Instantiate(BMessage *archive); static BArchivable* Instantiate(BMessage *archive);
virtual status_t Archive(BMessage *archive, bool deep = true) const; virtual status_t Archive(BMessage *archive,
bool deep = true) const;
virtual void AttachedToWindow(); virtual void AttachedToWindow();
virtual void DetachedFromWindow(); virtual void DetachedFromWindow();
@@ -60,11 +68,13 @@ class BCalendarView : public BView, public BInvoker {
virtual void Draw(BRect updateRect); virtual void Draw(BRect updateRect);
virtual void DrawDay(BView *owner, BRect frame, const char *text, virtual void DrawDay(BView *owner, BRect frame,
bool isSelected = false, bool isEnabled = true, const char *text, bool isSelected = false,
bool focus = false); bool isEnabled = true, bool focus = false);
virtual void DrawDayName(BView *owner, BRect frame, const char *text); virtual void DrawDayName(BView *owner, BRect frame,
virtual void DrawWeekNumber(BView *owner, BRect frame, const char *text); const char *text);
virtual void DrawWeekNumber(BView *owner, BRect frame,
const char *text);
virtual void MessageReceived(BMessage *message); virtual void MessageReceived(BMessage *message);
@@ -88,7 +98,8 @@ class BCalendarView : public BView, public BInvoker {
virtual void KeyDown(const char *bytes, int32 numBytes); virtual void KeyDown(const char *bytes, int32 numBytes);
virtual BHandler* ResolveSpecifier(BMessage *message, int32 index, virtual BHandler* ResolveSpecifier(BMessage *message, int32 index,
BMessage *specifier, int32 form, const char *property); BMessage *specifier, int32 form,
const char *property);
virtual status_t GetSupportedSuites(BMessage *data); virtual status_t GetSupportedSuites(BMessage *data);
virtual status_t Perform(perform_code code, void* arg); virtual status_t Perform(perform_code code, void* arg);
@@ -133,10 +144,11 @@ class BCalendarView : public BView, public BInvoker {
void _DrawWeekHeader(); void _DrawWeekHeader();
void _DrawDay(int32 curRow, int32 curColumn, void _DrawDay(int32 curRow, int32 curColumn,
int32 row, int32 column, int32 counter, int32 row, int32 column, int32 counter,
BRect frame, const char *text, bool focus = false); BRect frame, const char *text,
void _DrawItem(BView *owner, BRect frame, const char *text,
bool isSelected = false, bool isEnabled = true,
bool focus = false); bool focus = false);
void _DrawItem(BView *owner, BRect frame,
const char *text, bool isSelected = false,
bool isEnabled = true, bool focus = false);
void _UpdateSelection(); void _UpdateSelection();
BRect _FirstCalendarItemFrame() const; BRect _FirstCalendarItemFrame() const;
@@ -157,13 +169,23 @@ class BCalendarView : public BView, public BInvoker {
int32 column; int32 column;
Selection& operator=(const Selection &s) Selection& operator=(const Selection &s)
{ row = s.row; column = s.column; return *this; } {
row = s.row;
column = s.column;
return *this;
}
bool operator==(const Selection &s) const bool operator==(const Selection &s) const
{ return row == s.row && column == s.column; } {
return row == s.row
&& column == s.column;
}
bool operator!=(const Selection &s) const bool operator!=(const Selection &s) const
{ return row != s.row || column != s.column; } {
return row != s.row
|| column != s.column;
}
}; };
BRect _RectOfDay(const Selection &selection) const; BRect _RectOfDay(const Selection &selection) const;
src/kits/shared/CalendarView.cpp
+22 -12
View File
@@ -478,7 +478,8 @@ BCalendarView::MouseDown(BPoint where)
void void
BCalendarView::MouseMoved(BPoint point, uint32 code, const BMessage *dragMessage) BCalendarView::MouseMoved(BPoint point, uint32 code,
const BMessage *dragMessage)
{ {
BView::MouseMoved(point, code, dragMessage); BView::MouseMoved(point, code, dragMessage);
} }
@@ -806,7 +807,8 @@ BCalendarView::_SetToDay()
for (int32 row = 0; row < 6; ++row) { for (int32 row = 0; row < 6; ++row) {
for (int32 column = 0; column < 7; ++column) { for (int32 column = 0; column < 7; ++column) {
int32 day = counter - (firstDay - 1); int32 day = counter - (firstDay - 1);
if (counter >= firstDay && counter <= dayCountCurrent + firstDay - 1) { if (counter >= firstDay
&& counter <= dayCountCurrent + firstDay - 1) {
if (day == fDay) { if (day == fDay) {
fNewFocusedDay.SetTo(row, column); fNewFocusedDay.SetTo(row, column);
fNewSelectedDay.SetTo(row, column); fNewSelectedDay.SetTo(row, column);
@@ -845,7 +847,8 @@ BCalendarView::_GetYearMonth(int32 *year, int32 *month) const
int32 counter = 0; int32 counter = 0;
for (int32 row = 0; row < 6; ++row) { for (int32 row = 0; row < 6; ++row) {
for (int32 column = 0; column < 7; ++column) { for (int32 column = 0; column < 7; ++column) {
if (counter < firstDay || counter > dayCountCurrent + firstDay - 1) { if (counter < firstDay
|| counter > dayCountCurrent + firstDay - 1) {
if (counter - firstDay < 0) { if (counter - firstDay < 0) {
if (row == currRow && column == currColumn) { if (row == currRow && column == currColumn) {
*year = date.Year(); *year = date.Year();
@@ -954,7 +957,8 @@ BCalendarView::_SetupDayNumbers()
for (int32 row = 0; row < 6; ++row) { for (int32 row = 0; row < 6; ++row) {
for (int32 column = 0; column < 7; ++column) { for (int32 column = 0; column < 7; ++column) {
int32 day = counter - (firstDay - 1); int32 day = counter - (firstDay - 1);
if (counter < firstDay || counter > dayCountCurrent + firstDay - 1) { if (counter < firstDay
|| counter > dayCountCurrent + firstDay - 1) {
if (counter - firstDay < 0) if (counter - firstDay < 0)
day += lastDayBefore; day += lastDayBefore;
else else
@@ -997,8 +1001,8 @@ BCalendarView::_SetupWeekNumbers()
void void
BCalendarView::_DrawDay(int32 currRow, int32 currColumn, int32 row, int32 column, BCalendarView::_DrawDay(int32 currRow, int32 currColumn, int32 row,
int32 counter, BRect frame, const char *text, bool focus) int32 column, int32 counter, BRect frame, const char *text, bool focus)
{ {
const BDate date(fYear, fMonth, 1); const BDate date(fYear, fMonth, 1);
const int32 daysMonth = date.DaysInMonth(); const int32 daysMonth = date.DaysInMonth();
@@ -1044,7 +1048,8 @@ BCalendarView::_DrawDays()
counter++; counter++;
const char *day = fDayNumbers[row][column].String(); const char *day = fDayNumbers[row][column].String();
bool focus = isFocus && focusRow == row && focusColumn == column; bool focus = isFocus && focusRow == row && focusColumn == column;
_DrawDay(currRow, currColumn, row, column, counter, tmp, day, focus); _DrawDay(currRow, currColumn, row, column, counter, tmp, day,
focus);
tmp.OffsetBy(tmp.Width(), 0.0); tmp.OffsetBy(tmp.Width(), 0.0);
} }
@@ -1074,11 +1079,13 @@ BCalendarView::_DrawFocusRect()
bool focus = IsFocus() && true; bool focus = IsFocus() && true;
const char *day = fDayNumbers[row][column].String(); const char *day = fDayNumbers[row][column].String();
_DrawDay(currRow, currColumn, row, column, counter, tmp, day, focus); _DrawDay(currRow, currColumn, row, column, counter, tmp, day,
focus);
} }
else if (focusRow == row && focusColumn == column) { else if (focusRow == row && focusColumn == column) {
const char *day = fDayNumbers[row][column].String(); const char *day = fDayNumbers[row][column].String();
_DrawDay(currRow, currColumn, row, column, counter, tmp, day, false); _DrawDay(currRow, currColumn, row, column, counter, tmp, day,
false);
} }
tmp.OffsetBy(tmp.Width(), 0.0); tmp.OffsetBy(tmp.Width(), 0.0);
} }
@@ -1198,16 +1205,19 @@ BCalendarView::_UpdateSelection()
BRect tmp = frame; BRect tmp = frame;
for (int32 column = 0; column < 7; ++column) { for (int32 column = 0; column < 7; ++column) {
counter++; counter++;
if (fNewSelectedDay.row == row && fNewSelectedDay.column == column) { if (fNewSelectedDay.row == row
&& fNewSelectedDay.column == column) {
fSelectedDay.SetTo(row, column); fSelectedDay.SetTo(row, column);
const char *day = fDayNumbers[row][column].String(); const char *day = fDayNumbers[row][column].String();
bool focus = IsFocus() && focusRow == row && focusColumn == column; bool focus = IsFocus() && focusRow == row
&& focusColumn == column;
_DrawDay(row, column, row, column, counter, tmp, day, focus); _DrawDay(row, column, row, column, counter, tmp, day, focus);
} }
else if (currRow == row && currColumn == column) { else if (currRow == row && currColumn == column) {
const char *day = fDayNumbers[row][column].String(); const char *day = fDayNumbers[row][column].String();
bool focus = IsFocus() && focusRow == row && focusColumn == column; bool focus = IsFocus() && focusRow == row
&& focusColumn == column;
_DrawDay(currRow, currColumn, -1, -1, counter, tmp, day, focus); _DrawDay(currRow, currColumn, -1, -1, counter, tmp, day, focus);
} }
tmp.OffsetBy(tmp.Width(), 0.0); tmp.OffsetBy(tmp.Width(), 0.0);