From 27dc6eb7e154920329b9f6c9f84c338c5571ebed Mon Sep 17 00:00:00 2001 From: John Scipione Date: Fri, 20 Jun 2014 19:24:09 -0400 Subject: [PATCH] Tracker: style fixes to ViewState --- src/kits/tracker/ViewState.cpp | 11 +++++++++-- src/kits/tracker/ViewState.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/kits/tracker/ViewState.cpp b/src/kits/tracker/ViewState.cpp index 5420c1d9a2a..db8a085ac04 100644 --- a/src/kits/tracker/ViewState.cpp +++ b/src/kits/tracker/ViewState.cpp @@ -78,6 +78,9 @@ static const int32 kColumnStateMinArchiveVersion = 21; // bump version when layout changes +// #pragma mark - BColumn + + BColumn::BColumn(const char* title, float offset, float width, alignment align, const char* attributeName, uint32 attrType, const char* displayAs, bool statField, bool editable) @@ -244,7 +247,7 @@ BColumn::ArchiveToMessage(BMessage &message) const } -BColumn * +BColumn* BColumn::_Sanitize(BColumn* column) { if (column == NULL) @@ -273,7 +276,7 @@ BColumn::_Sanitize(BColumn* column) } -// #pragma mark - +// #pragma mark - BViewState BViewState::BViewState() @@ -469,15 +472,19 @@ BViewState::_Sanitize(BViewState* state, bool fixOnly) if (state->fViewMode == kListMode) { if (state->fListOrigin.x < 0) state->fListOrigin.x = 0; + if (state->fListOrigin.y < 0) state->fListOrigin.y = 0; } if (state->fIconSize < 16) state->fIconSize = 16; + if (state->fIconSize > 128) state->fIconSize = 128; + if (state->fLastIconSize < 16) state->fLastIconSize = 16; + if (state->fLastIconSize > 128) state->fLastIconSize = 128; diff --git a/src/kits/tracker/ViewState.h b/src/kits/tracker/ViewState.h index 40484e390e5..1403d1a77a3 100644 --- a/src/kits/tracker/ViewState.h +++ b/src/kits/tracker/ViewState.h @@ -423,4 +423,5 @@ BViewState::StateNeedsSaving() using namespace BPrivate; + #endif // _VIEW_STATE_H