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

Style cleanup.

Browse Source
This commit is contained in:
Axel Dörfler
2012-05-30 23:36:02 +02:00
parent d6e44c9c82
commit 712fdb70b2
1 changed files with 91 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/sudoku/SudokuView.h
+32 -14
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2007, Axel Dörfler, [email protected]. All rights reserved. * Copyright 2007-2012, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef SUDOKU_VIEW_H #ifndef SUDOKU_VIEW_H
@@ -9,6 +9,7 @@
#include <View.h> #include <View.h>
#include <ObjectList.h> #include <ObjectList.h>
class BDataIO; class BDataIO;
class SudokuField; class SudokuField;
struct entry_ref; struct entry_ref;
@@ -27,9 +28,11 @@ enum {
kExportAsPicture kExportAsPicture
}; };
class SudokuView : public BView { class SudokuView : public BView {
public: public:
SudokuView(BRect frame, const char* name, const BMessage& settings, SudokuView(BRect frame, const char* name,
const BMessage& settings,
uint32 resizingMode); uint32 resizingMode);
SudokuView(BMessage* archive); SudokuView(BMessage* archive);
virtual ~SudokuView(); virtual ~SudokuView();
@@ -44,7 +47,8 @@ public:
status_t SetTo(const char* data); status_t SetTo(const char* data);
status_t SetTo(SudokuField* field); status_t SetTo(SudokuField* field);
status_t SaveTo(entry_ref& ref, uint32 as = kExportAsText); status_t SaveTo(entry_ref& ref,
uint32 as = kExportAsText);
status_t SaveTo(BDataIO &to, uint32 as = kExportAsText); status_t SaveTo(BDataIO &to, uint32 as = kExportAsText);
status_t CopyToClipboard(); status_t CopyToClipboard();
@@ -79,47 +83,60 @@ protected:
virtual void Draw(BRect updateRect); virtual void Draw(BRect updateRect);
private: private:
status_t _FilterString(const char* data, size_t dataLength, char* buffer, status_t _FilterString(const char* data,
size_t dataLength, char* buffer,
uint32& out, bool& ignore); uint32& out, bool& ignore);
void _SetText(char* text, uint32 value); void _SetText(char* text, uint32 value);
char _BaseCharacter(); char _BaseCharacter();
bool _ValidCharacter(char c); bool _ValidCharacter(char c);
BPoint _LeftTop(uint32 x, uint32 y); BPoint _LeftTop(uint32 x, uint32 y);
BRect _Frame(uint32, uint32 y); BRect _Frame(uint32, uint32 y);
void _InvalidateHintField(uint32 x, uint32 y, uint32 hintX, uint32 hintY); void _InvalidateHintField(uint32 x, uint32 y,
uint32 hintX, uint32 hintY);
void _InvalidateField(uint32 x, uint32 y); void _InvalidateField(uint32 x, uint32 y);
void _InvalidateKeyboardFocus(uint32 x, uint32 y); void _InvalidateKeyboardFocus(uint32 x, uint32 y);
void _InsertKey(char rawKey, int32 modifiers); void _InsertKey(char rawKey, int32 modifiers);
void _RemoveHint(); void _RemoveHint();
bool _GetHintFieldFor(BPoint where, uint32 x, uint32 y, bool _GetHintFieldFor(BPoint where, uint32 x,
uint32& hintX, uint32& hintY); uint32 y, uint32& hintX, uint32& hintY);
bool _GetFieldFor(BPoint where, uint32& x, uint32& y); bool _GetFieldFor(BPoint where, uint32& x,
void _FitFont(BFont& font, float width, float height); uint32& y);
void _FitFont(BFont& font, float width,
float height);
void _DrawKeyboardFocus(); void _DrawKeyboardFocus();
void _DrawHints(uint32 x, uint32 y); void _DrawHints(uint32 x, uint32 y);
void _UndoRedo(BObjectList<BMessage>& undos, BObjectList<BMessage>& redos); void _UndoRedo(BObjectList<BMessage>& undos,
BObjectList<BMessage>& redos);
void _PushUndo(); void _PushUndo();
private:
rgb_color fBackgroundColor; rgb_color fBackgroundColor;
SudokuField* fField; SudokuField* fField;
BObjectList<BMessage> fUndos; BObjectList<BMessage> fUndos;
BObjectList<BMessage> fRedos; BObjectList<BMessage> fRedos;
uint32 fBlockSize; uint32 fBlockSize;
float fWidth, fHeight, fBaseline; float fWidth;
float fHeight;
float fBaseline;
BFont fFieldFont; BFont fFieldFont;
BFont fHintFont; BFont fHintFont;
float fHintHeight, fHintWidth, fHintBaseline; float fHintHeight;
uint32 fShowHintX, fShowHintY; float fHintWidth;
float fHintBaseline;
uint32 fShowHintX;
uint32 fShowHintY;
uint32 fLastHintValue; uint32 fLastHintValue;
bool fLastHintValueSet; bool fLastHintValueSet;
uint32 fLastField; uint32 fLastField;
uint32 fKeyboardX, fKeyboardY; uint32 fKeyboardX;
uint32 fKeyboardY;
uint32 fHintFlags; uint32 fHintFlags;
bool fShowKeyboardFocus; bool fShowKeyboardFocus;
bool fShowCursor; bool fShowCursor;
bool fEditable; bool fEditable;
}; };
static const uint32 kMsgSudokuSolved = 'susl'; static const uint32 kMsgSudokuSolved = 'susl';
static const uint32 kMsgSolveSudoku = 'slvs'; static const uint32 kMsgSolveSudoku = 'slvs';
static const uint32 kMsgSolveSingle = 'slsg'; static const uint32 kMsgSolveSingle = 'slsg';
@@ -127,4 +144,5 @@ static const uint32 kMsgSolveSingle = 'slsg';
// you can observe these: // you can observe these:
static const int32 kUndoRedoChanged = 'unre'; static const int32 kUndoRedoChanged = 'unre';
#endif // SUDOKU_VIEW_H #endif // SUDOKU_VIEW_H