Style fixes to IK, focus on docs

This commit is contained in:
John Scipione
2014-06-13 17:27:01 -04:00
parent 4a2260f21a
commit 1f424632be
34 changed files with 1141 additions and 1117 deletions
+19 -19
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2001-2006, Haiku, Inc. All rights reserved.
* Copyright 2001-2014 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _ALERT_H
@@ -9,11 +9,6 @@
#include <Window.h>
class BBitmap;
class BButton;
class BInvoker;
class BTextView;
// enum for flavors of alert
enum alert_type {
B_EMPTY_ALERT = 0,
@@ -29,41 +24,46 @@ enum button_spacing {
};
class BBitmap;
class BButton;
class BInvoker;
class BTextView;
class BAlert : public BWindow {
public:
public:
BAlert(const char* title, const char* text,
const char* button1, const char* button2 = NULL,
const char* button3 = NULL,
button_width width = B_WIDTH_AS_USUAL,
alert_type type = B_INFO_ALERT);
BAlert(const char *title, const char *text,
const char *button1, const char *button2,
const char *button3, button_width width,
BAlert(const char* title, const char* text,
const char* button1, const char* button2,
const char* button3, button_width width,
button_spacing spacing,
alert_type type = B_INFO_ALERT);
virtual ~BAlert();
// Archiving
BAlert(BMessage *data);
static BArchivable *Instantiate(BMessage *data);
virtual status_t Archive(BMessage *data, bool deep = true) const;
BAlert(BMessage* data);
static BArchivable *Instantiate(BMessage* data);
virtual status_t Archive(BMessage* data, bool deep = true) const;
// BAlert guts
void SetShortcut(int32 button_index, char key);
char Shortcut(int32 button_index) const;
int32 Go();
status_t Go(BInvoker *invoker);
status_t Go(BInvoker* invoker);
virtual void MessageReceived(BMessage *an_event);
virtual void MessageReceived(BMessage* message);
virtual void FrameResized(float new_width, float new_height);
BButton* ButtonAt(int32 index) const;
BTextView* TextView() const;
virtual BHandler* ResolveSpecifier(BMessage* message, int32 index,
BMessage* specifier, int32 form,
BMessage* specifier, int32 what,
const char* property);
virtual status_t GetSupportedSuites(BMessage *data);
virtual status_t GetSupportedSuites(BMessage* data);
virtual void DispatchMessage(BMessage* message, BHandler* handler);
virtual void Quit();
@@ -71,9 +71,9 @@ class BAlert : public BWindow {
static BPoint AlertPosition(float width, float height);
virtual status_t Perform(perform_code d, void *arg);
virtual status_t Perform(perform_code d, void* arg);
private:
private:
friend class _BAlertFilter_;
virtual void _ReservedAlert1();
+2 -3
View File
@@ -66,9 +66,9 @@ public:
virtual void ResizeToPreferred();
virtual status_t Invoke(BMessage* message = NULL);
virtual void FrameMoved(BPoint newPosition);
virtual void FrameResized(float width, float height);
virtual void FrameResized(float newWidth, float newHeight);
virtual void MakeFocus(bool focused = true);
virtual void MakeFocus(bool focus = true);
virtual void AllAttached();
virtual void AllDetached();
@@ -78,7 +78,6 @@ public:
virtual status_t GetSupportedSuites(BMessage* message);
virtual status_t Perform(perform_code d, void* arg);
virtual BSize MinSize();
virtual BSize MaxSize();
virtual BSize PreferredSize();
+23 -21
View File
@@ -5,34 +5,36 @@
#ifndef _CHANNEL_CONTROL_H
#define _CHANNEL_CONTROL_H
//! BChannelControl is the base class for controls that have several
// independent values, with minima and maxima.
#include <Control.h>
#include <String.h>
class BChannelControl : public BControl {
public:
BChannelControl(BRect frame, const char* name,
const char* label, BMessage* model,
int32 channelCount = 1,
uint32 resizeFlags
uint32 resizingMode
= B_FOLLOW_LEFT | B_FOLLOW_TOP,
uint32 viewFlags = B_WILL_DRAW);
uint32 flags = B_WILL_DRAW);
BChannelControl(const char* name,
const char* label, BMessage* model,
int32 channelCount = 1,
uint32 viewFlags = B_WILL_DRAW);
uint32 flags = B_WILL_DRAW);
BChannelControl(BMessage* archive);
virtual ~BChannelControl();
virtual status_t Archive(BMessage* into, bool deep = true) const;
virtual status_t Archive(BMessage* data, bool deep = true) const;
virtual void Draw(BRect updateRect) = 0;
virtual void MouseDown(BPoint where) = 0;
virtual void KeyDown(const char* bytes, int32 size) = 0;
virtual void KeyDown(const char* bytes, int32 numBytes) = 0;
virtual void FrameResized(float width, float height);
virtual void FrameResized(float newWidth, float newHeight);
virtual void SetFont(const BFont* font,
uint32 mask = B_FONT_ALL);
@@ -45,14 +47,14 @@ public:
virtual void MessageReceived(BMessage* message);
virtual BHandler* ResolveSpecifier(BMessage* message, int32 index,
BMessage* specifier, int32 form,
BMessage* specifier, int32 what,
const char* property);
virtual status_t GetSupportedSuites(BMessage* data);
virtual void SetModificationMessage(BMessage* message);
BMessage* ModificationMessage() const;
virtual status_t Invoke(BMessage* withMessage = NULL);
virtual status_t Invoke(BMessage* message = NULL);
//! These methods are similar to Invoke() Invoke() and InvokeNotify(), but
// include additional information about all of the channels in the control.
@@ -112,18 +114,18 @@ private:
BChannelControl(const BChannelControl& other);
BChannelControl& operator=(const BChannelControl& other);
virtual void _Reserverd_ChannelControl_0(void *, ...);
virtual void _Reserverd_ChannelControl_1(void *, ...);
virtual void _Reserverd_ChannelControl_2(void *, ...);
virtual void _Reserverd_ChannelControl_3(void *, ...);
virtual void _Reserverd_ChannelControl_4(void *, ...);
virtual void _Reserverd_ChannelControl_5(void *, ...);
virtual void _Reserverd_ChannelControl_6(void *, ...);
virtual void _Reserverd_ChannelControl_7(void *, ...);
virtual void _Reserverd_ChannelControl_8(void *, ...);
virtual void _Reserverd_ChannelControl_9(void *, ...);
virtual void _Reserverd_ChannelControl_10(void *, ...);
virtual void _Reserverd_ChannelControl_11(void *, ...);
virtual void _Reserverd_ChannelControl_0(void*, ...);
virtual void _Reserverd_ChannelControl_1(void*, ...);
virtual void _Reserverd_ChannelControl_2(void*, ...);
virtual void _Reserverd_ChannelControl_3(void*, ...);
virtual void _Reserverd_ChannelControl_4(void*, ...);
virtual void _Reserverd_ChannelControl_5(void*, ...);
virtual void _Reserverd_ChannelControl_6(void*, ...);
virtual void _Reserverd_ChannelControl_7(void*, ...);
virtual void _Reserverd_ChannelControl_8(void*, ...);
virtual void _Reserverd_ChannelControl_9(void*, ...);
virtual void _Reserverd_ChannelControl_10(void*, ...);
virtual void _Reserverd_ChannelControl_11(void*, ...);
protected:
inline int32* const& MinLimitList() const;
+1 -1
View File
@@ -36,7 +36,7 @@ public:
virtual void AllDetached();
virtual void FrameMoved(BPoint newPosition);
virtual void FrameResized(float width, float height);
virtual void FrameResized(float newWidth, float newHeight);
virtual void WindowActivated(bool active);
virtual void MessageReceived(BMessage* message);
+4 -4
View File
@@ -29,11 +29,11 @@ public:
float cellSize, const char* name,
BMessage* message = NULL,
bool useOffscreen = false);
BColorControl(BMessage* archive);
BColorControl(BMessage* data);
virtual ~BColorControl();
static BArchivable* Instantiate(BMessage* archive);
virtual status_t Archive(BMessage* archive,
static BArchivable* Instantiate(BMessage* data);
virtual status_t Archive(BMessage* data,
bool deep = true) const;
virtual void SetLayout(BLayout* layout);
@@ -91,7 +91,7 @@ private:
void _InitData(color_control_layout layout,
float size, bool useOffscreen,
BMessage* archive = NULL);
BMessage* data = NULL);
void _LayoutView();
void _InitOffscreen();
void _InvalidateSelector(int16 ramp,
+1 -1
View File
@@ -45,7 +45,7 @@ public:
virtual void AllDetached();
virtual void MessageReceived(BMessage* message);
virtual void MakeFocus(bool focused = true);
virtual void MakeFocus(bool focus = true);
virtual void KeyDown(const char* bytes, int32 numBytes);
virtual void MouseDown(BPoint where);
+3 -3
View File
@@ -53,8 +53,8 @@ public:
virtual void AllDetached();
virtual void FrameResized(float newWidth, float newHeight);
virtual void FrameMoved(BPoint newPosition);
virtual void TargetedByScrollView(BScrollView* scroller);
virtual void WindowActivated(bool state);
virtual void TargetedByScrollView(BScrollView* view);
virtual void WindowActivated(bool active);
virtual void MessageReceived(BMessage* message);
virtual void KeyDown(const char* bytes, int32 numBytes);
@@ -142,7 +142,7 @@ public:
virtual BHandler* ResolveSpecifier(BMessage* message,
int32 index, BMessage* specifier,
int32 form, const char* property);
int32 what, const char* property);
virtual status_t GetSupportedSuites(BMessage* data);
virtual status_t Perform(perform_code code, void* arg);
+1 -1
View File
@@ -45,7 +45,7 @@ public:
virtual void KeyDown(const char* bytes, int32 numBytes);
virtual void MakeFocus(bool focused);
virtual void MessageReceived(BMessage* message);
virtual void WindowActivated(bool state);
virtual void WindowActivated(bool active);
virtual void MouseUp(BPoint where);
virtual void MouseMoved(BPoint where, uint32 transit,
const BMessage* dragMessage);
+18 -18
View File
@@ -24,7 +24,7 @@ public:
uint32 flags = B_WILL_DRAW
| B_FRAME_EVENTS | B_NAVIGABLE);
BOutlineListView(BMessage* archive);
virtual ~BOutlineListView();
virtual ~BOutlineListView();
static BArchivable* Instantiate(BMessage* archive);
virtual status_t Archive(BMessage* archive,
@@ -36,16 +36,16 @@ public:
virtual void FrameResized(float newWidth, float newHeight);
virtual void MouseUp(BPoint where);
virtual bool AddUnder(BListItem* item, BListItem* superItem);
virtual bool AddUnder(BListItem* item, BListItem* superItem);
virtual bool AddItem(BListItem* item);
virtual bool AddItem(BListItem* item, int32 fullListIndex);
virtual bool AddList(BList* newItems);
virtual bool AddList(BList* newItems, int32 fullListIndex);
virtual bool AddItem(BListItem* item);
virtual bool AddItem(BListItem* item, int32 fullListIndex);
virtual bool AddList(BList* newItems);
virtual bool AddList(BList* newItems, int32 fullListIndex);
virtual bool RemoveItem(BListItem* item);
virtual BListItem* RemoveItem(int32 fullListIndex);
virtual bool RemoveItems(int32 fullListIndex, int32 count);
virtual bool RemoveItem(BListItem* item);
virtual BListItem* RemoveItem(int32 fullListIndex);
virtual bool RemoveItems(int32 fullListIndex, int32 count);
BListItem* FullListItemAt(int32 fullListIndex) const;
int32 FullListIndexOf(BPoint where) const;
@@ -70,19 +70,19 @@ public:
bool IsExpanded(int32 fullListIndex);
virtual BHandler* ResolveSpecifier(BMessage* message,
virtual BHandler* ResolveSpecifier(BMessage* message,
int32 index, BMessage* specifier,
int32 what, const char* property);
virtual status_t GetSupportedSuites(BMessage* data);
virtual status_t Perform(perform_code code, void* data);
virtual status_t GetSupportedSuites(BMessage* data);
virtual status_t Perform(perform_code code, void* data);
virtual void ResizeToPreferred();
virtual void GetPreferredSize(float* _width,
virtual void ResizeToPreferred();
virtual void GetPreferredSize(float* _width,
float* _height);
virtual void MakeFocus(bool focus = true);
virtual void AllAttached();
virtual void AllDetached();
virtual void DetachedFromWindow();
virtual void MakeFocus(bool focus = true);
virtual void AllAttached();
virtual void AllDetached();
virtual void DetachedFromWindow();
void FullListSortItems(int (*compareFunc)(
const BListItem* first,
+7 -7
View File
@@ -41,11 +41,11 @@ public:
virtual void ResizeToPreferred();
virtual void GetPreferredSize(float* _width,
float* _height);
virtual void FrameMoved(BPoint position);
virtual void FrameResized(float width, float height);
virtual void FrameMoved(BPoint newPosition);
virtual void FrameResized(float newWidth, float newHeight);
virtual void WindowActivated(bool state);
virtual void MakeFocus(bool state = true);
virtual void WindowActivated(bool active);
virtual void MakeFocus(bool focus = true);
virtual void Draw(BRect updateRect);
@@ -53,8 +53,8 @@ public:
virtual void KeyDown(const char* bytes, int32 numBytes);
virtual void MouseDown(BPoint where);
virtual void MouseUp(BPoint where);
virtual void MouseMoved(BPoint where, uint32 transit,
const BMessage* message);
virtual void MouseMoved(BPoint where, uint32 code,
const BMessage* dragMessage);
virtual void SetEnabledOn(BPicture* picture);
virtual void SetEnabledOff(BPicture* picture);
@@ -74,7 +74,7 @@ public:
virtual BHandler* ResolveSpecifier(BMessage* message,
int32 index, BMessage* specifier,
int32 form, const char* property);
int32 what, const char* property);
virtual status_t GetSupportedSuites(BMessage* data);
virtual status_t Perform(perform_code code, void* data);
+2 -2
View File
@@ -46,13 +46,13 @@ public:
const BMessage* dragMessage);
virtual void DetachedFromWindow();
virtual void FrameMoved(BPoint newPosition);
virtual void FrameResized(float width, float height);
virtual void FrameResized(float newWidth, float newHeight);
virtual BHandler* ResolveSpecifier(BMessage* message,
int32 index, BMessage* specifier,
int32 what, const char* property);
virtual void MakeFocus(bool focused = true);
virtual void MakeFocus(bool focus = true);
virtual void AllAttached();
virtual void AllDetached();
virtual status_t GetSupportedSuites(BMessage* message);
+2 -2
View File
@@ -34,8 +34,8 @@ public:
BRegion& operator=(const BRegion& other);
bool operator==(const BRegion& other) const;
void Set(BRect newBounds);
void Set(clipping_rect newBounds);
void Set(BRect rect);
void Set(clipping_rect clipping);
BRect Frame() const;
clipping_rect FrameInt() const;
+33 -25
View File
@@ -33,11 +33,33 @@ public:
virtual status_t Archive(BMessage* archive,
bool deep = true) const;
virtual void AllAttached();
virtual void AllDetached();
virtual void AttachedToWindow();
virtual void DetachedFromWindow();
virtual void Draw(BRect updateRect);
virtual void FrameMoved(BPoint new_position);
virtual void FrameResized(float newWidth, float newHeight);
virtual void MessageReceived(BMessage* message);
virtual void MouseDown(BPoint where);
virtual void MouseUp(BPoint where);
virtual void MouseMoved(BPoint where, uint32 code,
const BMessage* dragMessage);
#if DISABLES_ON_WINDOW_DEACTIVATION
virtual void WindowActivated(bool active);
#endif
void SetValue(float value);
float Value() const;
void SetProportion(float);
float Proportion() const;
virtual void ValueChanged(float newValue);
void SetRange(float min, float max);
@@ -45,10 +67,12 @@ public:
void SetSteps(float smallStep, float largeStep);
void GetSteps(float* _smallStep,
float* _largeStep) const;
void SetTarget(BView *target);
void SetTarget(const char* targetName);
BView* Target() const;
void SetOrientation(orientation orientation);
void SetOrientation(orientation direction);
orientation Orientation() const;
// TODO: Make this a virtual method, it should be one,
@@ -56,39 +80,23 @@ public:
// to be used in case the BScrollBar should draw part of
// the focus indication of the target view for aesthetical
// reasons. BScrollView will forward this method.
status_t SetBorderHighlighted(bool state);
status_t SetBorderHighlighted(bool highlight);
virtual void MessageReceived(BMessage* message);
virtual void MouseDown(BPoint pt);
virtual void MouseUp(BPoint pt);
virtual void MouseMoved(BPoint pt, uint32 code,
const BMessage* dragMessage);
virtual void DetachedFromWindow();
virtual void Draw(BRect updateRect);
virtual void FrameMoved(BPoint new_position);
virtual void FrameResized(float newWidth, float newHeight);
virtual BHandler* ResolveSpecifier(BMessage* message,
int32 index, BMessage* specifier,
int32 form, const char* property);
virtual void ResizeToPreferred();
virtual void GetPreferredSize(float* _width,
float* _height);
virtual void MakeFocus(bool state = true);
virtual void AllAttached();
virtual void AllDetached();
virtual status_t GetSupportedSuites(BMessage* data);
virtual void ResizeToPreferred();
virtual void MakeFocus(bool focus = true);
virtual BSize MinSize();
virtual BSize MaxSize();
virtual BSize PreferredSize();
virtual status_t Perform(perform_code d, void* arg);
virtual status_t GetSupportedSuites(BMessage* message);
virtual BHandler* ResolveSpecifier(BMessage* message,
int32 index, BMessage* specifier,
int32 what, const char* property);
#if DISABLES_ON_WINDOW_DEACTIVATION
virtual void WindowActivated(bool active);
#endif
virtual status_t Perform(perform_code d, void* arg);
private:
class Private;
+36 -29
View File
@@ -1,6 +1,11 @@
/*
* Copyright 2004-2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT license.
* Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de.
* Copyright 2014 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Axel Dörfler, axeld@pinc-software.de
* John Scipione, jscpione@gmail.com
*/
#ifndef _SCROLL_VIEW_H
#define _SCROLL_VIEW_H
@@ -28,55 +33,57 @@ public:
virtual ~BScrollView();
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 DetachedFromWindow();
// Hook methods
virtual void AllAttached();
virtual void AllDetached();
virtual void Draw(BRect updateRect);
virtual void AttachedToWindow();
virtual void DetachedFromWindow();
virtual void WindowActivated(bool active);
virtual void MakeFocus(bool state = true);
virtual void Draw(BRect updateRect);
virtual void FrameMoved(BPoint newPosition);
virtual void FrameResized(float newWidth, float newHeight);
virtual void MessageReceived(BMessage* message);
virtual void MouseDown(BPoint where);
virtual void MouseMoved(BPoint where, uint32 code,
const BMessage* dragMessage);
virtual void MouseUp(BPoint where);
virtual void WindowActivated(bool active);
// Size
virtual void GetPreferredSize(float* _width, float* _height);
virtual void ResizeToPreferred();
virtual void MakeFocus(bool focus = true);
virtual void GetPreferredSize(float* _width,
float* _height);
virtual BSize MinSize();
virtual BSize MaxSize();
virtual BSize PreferredSize();
virtual void ResizeToPreferred();
virtual void FrameMoved(BPoint position);
virtual void FrameResized(float width, float height);
virtual void MessageReceived(BMessage* message);
virtual void MouseDown(BPoint point);
virtual void MouseUp(BPoint point);
virtual void MouseMoved(BPoint point, uint32 code,
const BMessage* dragMessage);
// BScrollView
// BScrollBar
BScrollBar* ScrollBar(orientation posture) const;
virtual void SetBorder(border_style border);
virtual void SetBorder(border_style border);
border_style Border() const;
virtual status_t SetBorderHighlighted(bool state);
virtual status_t SetBorderHighlighted(bool highlight);
bool IsBorderHighlighted() const;
void SetTarget(BView* target);
BView* Target() const;
// Scripting
virtual BHandler* ResolveSpecifier(BMessage* message,
virtual BHandler* ResolveSpecifier(BMessage* message,
int32 index, BMessage* specifier,
int32 form, const char* property);
virtual status_t GetSupportedSuites(BMessage* data);
int32 what, const char* property);
virtual status_t GetSupportedSuites(BMessage* message);
virtual status_t Perform(perform_code d, void* arg);
virtual status_t Perform(perform_code d, void* arg);
protected:
virtual void LayoutInvalidated(bool descendants = false);
+6 -6
View File
@@ -75,11 +75,11 @@ public:
virtual void MouseUp(BPoint where);
virtual void MouseMoved(BPoint where, uint32 code,
const BMessage* dragMessage);
virtual void WindowActivated(bool state);
virtual void WindowActivated(bool active);
virtual void KeyDown(const char* bytes, int32 numBytes);
virtual void Pulse();
virtual void FrameResized(float width, float height);
virtual void MakeFocus(bool focusState = true);
virtual void FrameResized(float newWidth, float newHeight);
virtual void MakeFocus(bool focus = true);
virtual void MessageReceived(BMessage* message);
virtual BHandler* ResolveSpecifier(BMessage* message,
@@ -114,7 +114,7 @@ public:
int32 CountLines() const;
int32 CurrentLine() const;
void GoToLine(int32 lineIndex);
void GoToLine(int32 lineNumber);
virtual void Cut(BClipboard* clipboard);
virtual void Copy(BClipboard* clipboard);
@@ -159,8 +159,8 @@ public:
virtual bool CanEndLine(int32 offset);
float LineWidth(int32 lineIndex = 0) const;
float LineHeight(int32 lineIndex = 0) const;
float LineWidth(int32 lineNumber = 0) const;
float LineHeight(int32 lineNumber = 0) const;
float TextHeight(int32 startLine,
int32 endLine) const;
+4 -4
View File
@@ -170,7 +170,7 @@ public:
virtual void MouseUp(BPoint where);
virtual void MouseMoved(BPoint where, uint32 code,
const BMessage* dragMessage);
virtual void WindowActivated(bool state);
virtual void WindowActivated(bool active);
virtual void KeyDown(const char* bytes, int32 numBytes);
virtual void KeyUp(const char* bytes, int32 numBytes);
virtual void Pulse();
@@ -285,7 +285,7 @@ public:
void SetFillRule(int32 rule);
int32 FillRule() const;
void SetOrigin(BPoint pt);
void SetOrigin(BPoint where);
void SetOrigin(float x, float y);
BPoint Origin() const;
@@ -522,7 +522,7 @@ public:
void ScrollBy(float dh, float dv);
void ScrollTo(float x, float y);
virtual void ScrollTo(BPoint where);
virtual void MakeFocus(bool focusState = true);
virtual void MakeFocus(bool focus = true);
bool IsFocus() const;
virtual void Show();
@@ -536,7 +536,7 @@ public:
virtual void GetPreferredSize(float* _width, float* _height);
virtual void ResizeToPreferred();
BScrollBar* ScrollBar(orientation posture) const;
BScrollBar* ScrollBar(orientation direction) const;
virtual BHandler* ResolveSpecifier(BMessage* message, int32 index,
BMessage* specifier, int32 form,
+1 -1
View File
@@ -149,7 +149,7 @@ public:
BView* CurrentFocus() const;
void Activate(bool = true);
virtual void WindowActivated(bool state);
virtual void WindowActivated(bool focus);
void ConvertToScreen(BPoint* point) const;
BPoint ConvertToScreen(BPoint point) const;