[haiku-commits] r33449 - haiku/trunk/src/preferences/touchpad
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 6 Oct 2009 10:19:49 +0200 (CEST)
Author: axeld
Date: 2009-10-06 10:19:49 +0200 (Tue, 06 Oct 2009)
New Revision: 33449
Changeset: http://dev.haiku-os.org/changeset/33449/haiku
Modified:
haiku/trunk/src/preferences/touchpad/TouchpadPref.cpp
haiku/trunk/src/preferences/touchpad/TouchpadPref.h
haiku/trunk/src/preferences/touchpad/TouchpadPrefView.cpp
haiku/trunk/src/preferences/touchpad/TouchpadPrefView.h
haiku/trunk/src/preferences/touchpad/main.cpp
Log:
* Added missing license headers.
* Coding style cleanup.
Modified: haiku/trunk/src/preferences/touchpad/TouchpadPref.cpp
===================================================================
--- haiku/trunk/src/preferences/touchpad/TouchpadPref.cpp 2009-10-06
07:52:09 UTC (rev 33448)
+++ haiku/trunk/src/preferences/touchpad/TouchpadPref.cpp 2009-10-06
08:19:49 UTC (rev 33449)
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2008-2009, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * Clemens Zeidler (haiku@xxxxxxxxxxxxxxxxxx)
+ */
+
+
#include "TouchpadPref.h"
#include <List.h>
Modified: haiku/trunk/src/preferences/touchpad/TouchpadPref.h
===================================================================
--- haiku/trunk/src/preferences/touchpad/TouchpadPref.h 2009-10-06 07:52:09 UTC
(rev 33448)
+++ haiku/trunk/src/preferences/touchpad/TouchpadPref.h 2009-10-06 08:19:49 UTC
(rev 33449)
@@ -1,6 +1,14 @@
-#ifndef TouchpadPref_h
-#define TouchpadPref_h
+/*
+ * Copyright 2008-2009, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * Clemens Zeidler (haiku@xxxxxxxxxxxxxxxxxx)
+ */
+#ifndef TOUCHPAD_PREF_H
+#define TOUCHPAD_PREF_H
+
#define DEBUG 1
#include <Debug.h>
@@ -15,36 +23,38 @@
#endif
-// draw a touchpad
-class TouchpadPref
-{
- public:
- TouchpadPref();
- ~TouchpadPref();
-
- void Revert();
- void Defaults();
-
- BPoint WindowPosition(){return
fWindowPosition;}
- void SetWindowPosition(BPoint
position){
- fWindowPosition
= position;}
-
- touchpad_settings * GetSettings(){return &fSettings;}
- status_t UpdateSettings();
- private:
- status_t GetSettingsPath(BPath &path);
- status_t LoadSettings();
- status_t SaveSettings();
-
- status_t ConnectToTouchPad();
-
- bool fConnected;
- BInputDevice * fTouchPad;
-
- touchpad_settings fSettings;
- touchpad_settings fStartSettings;
- BPoint fWindowPosition;
+class TouchpadPref {
+public:
+ TouchpadPref();
+ ~TouchpadPref();
+
+ void Revert();
+ void Defaults();
+
+ BPoint WindowPosition()
+ {
return fWindowPosition; }
+ void
SetWindowPosition(BPoint position)
+ {
fWindowPosition = position; }
+
+ touchpad_settings& Settings()
+ {
return fSettings; }
+
+ status_t UpdateSettings();
+
+private:
+ status_t GetSettingsPath(BPath&
path);
+ status_t LoadSettings();
+ status_t SaveSettings();
+
+ status_t ConnectToTouchPad();
+
+ bool fConnected;
+ BInputDevice* fTouchPad;
+
+ touchpad_settings fSettings;
+ touchpad_settings fStartSettings;
+ BPoint fWindowPosition;
};
-#endif
\ No newline at end of file
+#endif // TOUCHPAD_PREF_H
Modified: haiku/trunk/src/preferences/touchpad/TouchpadPrefView.cpp
===================================================================
--- haiku/trunk/src/preferences/touchpad/TouchpadPrefView.cpp 2009-10-06
07:52:09 UTC (rev 33448)
+++ haiku/trunk/src/preferences/touchpad/TouchpadPrefView.cpp 2009-10-06
08:19:49 UTC (rev 33449)
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2008-2009, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * Clemens Zeidler (haiku@xxxxxxxxxxxxxxxxxx)
+ */
+
+
#include "TouchpadPrefView.h"
#include "kb_mouse_driver.h"
@@ -25,7 +34,8 @@
TouchpadView::TouchpadView(BRect frame)
- :BView(frame, "TouchpadView", B_FOLLOW_NONE, B_WILL_DRAW)
+ :
+ BView(frame, "TouchpadView", B_FOLLOW_NONE, B_WILL_DRAW)
{
fXTracking = false;
fYTracking = false;
@@ -43,9 +53,8 @@
TouchpadView::~TouchpadView()
{
- if(fOffScreenBitmap){
- delete fOffScreenBitmap;
- }
+puts("GONE!");
+ delete fOffScreenBitmap;
}
@@ -53,25 +62,22 @@
TouchpadView::Draw(BRect updateRect)
{
DrawSliders();
-
}
void
TouchpadView::MouseDown(BPoint point)
{
- if(fXScrollDragZone.Contains(point))
- {
+ if (fXScrollDragZone.Contains(point)) {
fXTracking = true;
fOldXScrollRange = fXScrollRange;
- SetMouseEventMask( B_POINTER_EVENTS, B_LOCK_WINDOW_FOCUS );
+ SetMouseEventMask(B_POINTER_EVENTS, B_LOCK_WINDOW_FOCUS);
}
- if(fYScrollDragZone.Contains(point))
- {
+ if (fYScrollDragZone.Contains(point)) {
fYTracking = true;
fOldYScrollRange = fYScrollRange;
- SetMouseEventMask( B_POINTER_EVENTS, B_LOCK_WINDOW_FOCUS );
+ SetMouseEventMask(B_POINTER_EVENTS, B_LOCK_WINDOW_FOCUS);
}
}
@@ -79,28 +85,28 @@
void
TouchpadView::MouseUp(BPoint point)
{
- if(fXTracking || fYTracking){
- fXTracking = false;
- fYTracking = false;
- int32 result = 0;
- if(GetRightScrollRatio() > 0.7 || GetBottomScrollRatio() > 0.7){
- BAlert *alert = new BAlert("ReallyChangeScrollArea",
- "The new scroll area is very small. Do you
really want to change the scroll area?", "Ok", "Cancel",
- NULL,
- B_WIDTH_AS_USUAL,
- B_WARNING_ALERT);
- result = alert->Go();
- }
- if(result == 0){
- BMessage msg(SCROLL_AREA_CHANGED);
- Invoke(&msg);
- }
- else{
- fXScrollRange = fOldXScrollRange;
- fYScrollRange = fOldYScrollRange;
- DrawSliders();
- }
+ if (!fXTracking && !fYTracking)
+ return;
+
+ fXTracking = false;
+ fYTracking = false;
+
+ int32 result = 0;
+ if (GetRightScrollRatio() > 0.7 || GetBottomScrollRatio() > 0.7) {
+ BAlert *alert = new BAlert("ReallyChangeScrollArea",
+ "The new scroll area is very small. Do you really want
to change "
+ "the scroll area?", "Ok", "Cancel", NULL,
B_WIDTH_AS_USUAL,
+ B_WARNING_ALERT);
+ result = alert->Go();
}
+ if (result == 0) {
+ BMessage msg(SCROLL_AREA_CHANGED);
+ Invoke(&msg);
+ } else {
+ fXScrollRange = fOldXScrollRange;
+ fYScrollRange = fOldYScrollRange;
+ DrawSliders();
+ }
}
@@ -115,7 +121,6 @@
if (fOffScreenBitmap && fOffScreenView)
fOffScreenBitmap->AddChild(fOffScreenView);
-
}
}
@@ -130,39 +135,37 @@
void
-TouchpadView::GetPreferredSize(float *width, float *height)
+TouchpadView::GetPreferredSize(float* width, float* height)
{
- *width = fPrefRect.Width();
- *height = fPrefRect.Height();
+ if (width != NULL)
+ *width = fPrefRect.Width();
+ if (height != NULL)
+ *height = fPrefRect.Height();
}
void
-TouchpadView::MouseMoved(BPoint point, uint32 transit, const BMessage *message)
+TouchpadView::MouseMoved(BPoint point, uint32 transit, const BMessage* message)
{
- if(fXTracking){
- if(point.x > fPadRect.right){
+ if (fXTracking) {
+ if (point.x > fPadRect.right)
fXScrollRange = fPadRect.Width();
- }
- else if(point.x < fPadRect.left){
+ else if (point.x < fPadRect.left)
fXScrollRange = 0;
- }
- else{
+ else
fXScrollRange = point.x - fPadRect.left;
- }
+
DrawSliders();
}
- if(fYTracking){
- if(point.y > fPadRect.bottom){
+ if (fYTracking){
+ if (point.y > fPadRect.bottom)
fYScrollRange = fPadRect.Height();
- }
- else if(point.y < fPadRect.top){
+ else if (point.y < fPadRect.top)
fYScrollRange = 0;
- }
- else{
+ else
fYScrollRange = point.y - fPadRect.top;
- }
+
DrawSliders();
}
}
@@ -172,126 +175,124 @@
void
TouchpadView::DrawSliders()
{
- BView *view = NULL;
- if(fOffScreenView){
+ BView *view;
+ if (fOffScreenView != NULL)
view = fOffScreenView;
- }
- else{
+ else
view = this;
- }
- if (LockLooper()) {
+ if (!LockLooper())
+ return;
+
if (fOffScreenBitmap->Lock()) {
- view->SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR));
- view->FillRect(Bounds());
- view->SetHighColor(100, 100, 100);
- view->FillRoundRect(fPadRect, 4, 4);
+ view->SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+ view->FillRect(Bounds());
+ view->SetHighColor(100, 100, 100);
+ view->FillRoundRect(fPadRect, 4, 4);
- int32 dragSize = 3; //half drag size
+ int32 dragSize = 3; // half drag size
- // scroll areas
- view->SetHighColor(145, 100, 100);
- BRect rightRect(fPadRect.left + fXScrollRange, fPadRect.top,
- fPadRect.right,
fPadRect.bottom);
- view->FillRoundRect(rightRect, 4, 4);
+ // scroll areas
+ view->SetHighColor(145, 100, 100);
+ BRect rightRect(fPadRect.left + fXScrollRange, fPadRect.top,
+ fPadRect.right, fPadRect.bottom);
+ view->FillRoundRect(rightRect, 4, 4);
- BRect bottomRect(fPadRect.left, fPadRect.top + fYScrollRange,
- fPadRect.right,
fPadRect.bottom);
- view->FillRoundRect(bottomRect, 4, 4);
+ BRect bottomRect(fPadRect.left, fPadRect.top + fYScrollRange,
+ fPadRect.right, fPadRect.bottom);
+ view->FillRoundRect(bottomRect, 4, 4);
- // Stroke Rect
- view->SetHighColor(100, 100, 100);
- view->SetPenSize(2);
- view->StrokeRoundRect(fPadRect, 4, 4);
+ // Stroke Rect
+ view->SetHighColor(100, 100, 100);
+ view->SetPenSize(2);
+ view->StrokeRoundRect(fPadRect, 4, 4);
- // x scroll range line
- view->SetHighColor(200, 0, 0);
- view->StrokeLine(BPoint(fPadRect.left + fXScrollRange, fPadRect.top),
- BPoint(fPadRect.left + fXScrollRange,
fPadRect.bottom));
+ // x scroll range line
+ view->SetHighColor(200, 0, 0);
+ view->StrokeLine(BPoint(fPadRect.left + fXScrollRange,
fPadRect.top),
+ BPoint(fPadRect.left + fXScrollRange, fPadRect.bottom));
- fXScrollDragZone = BRect(fPadRect.left + fXScrollRange - dragSize,
- fPadRect.top - dragSize,
- fPadRect.left + fXScrollRange +
dragSize,
- fPadRect.bottom + dragSize);
- fXScrollDragZone1 = BRect(fPadRect.left + fXScrollRange - dragSize,
- fPadRect.top - dragSize,
- fPadRect.left + fXScrollRange +
dragSize,
- fPadRect.top + dragSize);
- view->FillRect(fXScrollDragZone1);
- fXScrollDragZone2 = BRect(fPadRect.left + fXScrollRange - dragSize,
- fPadRect.bottom - dragSize,
- fPadRect.left + fXScrollRange +
dragSize,
- fPadRect.bottom + dragSize);
- view->FillRect(fXScrollDragZone2);
+ fXScrollDragZone = BRect(fPadRect.left + fXScrollRange -
dragSize,
+ fPadRect.top - dragSize, fPadRect.left + fXScrollRange
+ dragSize,
+ fPadRect.bottom + dragSize);
+ fXScrollDragZone1 = BRect(fPadRect.left + fXScrollRange -
dragSize,
+ fPadRect.top - dragSize, fPadRect.left + fXScrollRange
+ dragSize,
+ fPadRect.top + dragSize);
+ view->FillRect(fXScrollDragZone1);
+ fXScrollDragZone2 = BRect(fPadRect.left + fXScrollRange -
dragSize,
+ fPadRect.bottom - dragSize,
+ fPadRect.left + fXScrollRange + dragSize,
+ fPadRect.bottom + dragSize);
+ view->FillRect(fXScrollDragZone2);
- // y scroll range line
- view->StrokeLine(BPoint(fPadRect.left, fPadRect.top + fYScrollRange),
- BPoint(fPadRect.right, fPadRect.top +
fYScrollRange));
+ // y scroll range line
+ view->StrokeLine(BPoint(fPadRect.left, fPadRect.top +
fYScrollRange),
+ BPoint(fPadRect.right, fPadRect.top + fYScrollRange));
- fYScrollDragZone = BRect(fPadRect.left - dragSize,
- fPadRect.top + fYScrollRange - dragSize,
- fPadRect.right + dragSize,
- fPadRect.top + fYScrollRange +
dragSize);
- fYScrollDragZone1 = BRect(fPadRect.left - dragSize,
- fPadRect.top + fYScrollRange - dragSize,
- fPadRect.left + dragSize,
- fPadRect.top + fYScrollRange +
dragSize);
- view->FillRect(fYScrollDragZone1);
- fYScrollDragZone2 = BRect(fPadRect.right - dragSize,
- fPadRect.top + fYScrollRange - dragSize,
- fPadRect.right + dragSize,
- fPadRect.top + fYScrollRange +
dragSize);
- view->FillRect(fYScrollDragZone2);
+ fYScrollDragZone = BRect(fPadRect.left - dragSize,
+ fPadRect.top + fYScrollRange - dragSize,
+ fPadRect.right + dragSize,
+ fPadRect.top + fYScrollRange + dragSize);
+ fYScrollDragZone1 = BRect(fPadRect.left - dragSize,
+ fPadRect.top + fYScrollRange - dragSize, fPadRect.left
+ dragSize,
+ fPadRect.top + fYScrollRange + dragSize);
+ view->FillRect(fYScrollDragZone1);
+ fYScrollDragZone2 = BRect(fPadRect.right - dragSize,
+ fPadRect.top + fYScrollRange - dragSize, fPadRect.right
+ dragSize,
+ fPadRect.top + fYScrollRange + dragSize);
+ view->FillRect(fYScrollDragZone2);
fOffScreenView->Sync();
fOffScreenBitmap->Unlock();
DrawBitmap(fOffScreenBitmap, B_ORIGIN);
+ }
-
- }
- UnlockLooper();
- }
+ UnlockLooper();
}
-// -------TouchpadPrefView----------
+
+// #pragma mark - TouchpadPrefView
+
+
TouchpadPrefView::TouchpadPrefView(BRect frame, const char *name)
- :BView(frame, name,
B_FOLLOW_ALL_SIDES, 0)
+ :
+ BView(frame, name, B_FOLLOW_ALL_SIDES, 0)
{
SetupView();
// set view values
- SetValues(fTouchpadPref.GetSettings());
+ SetValues(&fTouchpadPref.Settings());
}
TouchpadPrefView::~TouchpadPrefView()
{
- delete fTouchpadView;
}
void
-TouchpadPrefView::MessageReceived(BMessage *msg)
+TouchpadPrefView::MessageReceived(BMessage* msg)
{
- touchpad_settings *settings = fTouchpadPref.GetSettings();
- switch(msg->what) {
+ touchpad_settings& settings = fTouchpadPref.Settings();
+ switch (msg->what) {
case SCROLL_AREA_CHANGED:
- settings->scroll_rightrange =
fTouchpadView->GetRightScrollRatio();
- settings->scroll_bottomrange =
fTouchpadView->GetBottomScrollRatio();
+ settings.scroll_rightrange =
fTouchpadView->GetRightScrollRatio();
+ settings.scroll_bottomrange =
fTouchpadView->GetBottomScrollRatio();
fRevertButton->SetEnabled(true);
fTouchpadPref.UpdateSettings();
break;
case SCROLL_CONTROL_CHANGED:
- settings->scroll_twofinger = (fTwoFingerBox->Value() ==
B_CONTROL_ON) ? true : false;
- settings->scroll_multifinger =
(fMultiFingerBox->Value() == B_CONTROL_ON) ? true : false;
- settings->scroll_acceleration =
fScrollAccelSlider->Value();
- settings->scroll_xstepsize = (20 -
fScrollStepXSlider->Value()) * 3;
- settings->scroll_ystepsize = (20 -
fScrollStepYSlider->Value()) * 3;
+ settings.scroll_twofinger = fTwoFingerBox->Value() ==
B_CONTROL_ON;
+ settings.scroll_multifinger
+ = fMultiFingerBox->Value() == B_CONTROL_ON;
+ settings.scroll_acceleration =
fScrollAccelSlider->Value();
+ settings.scroll_xstepsize = (20 -
fScrollStepXSlider->Value()) * 3;
+ settings.scroll_ystepsize = (20 -
fScrollStepYSlider->Value()) * 3;
fRevertButton->SetEnabled(true);
fTouchpadPref.UpdateSettings();
break;
case TAP_CONTROL_CHANGED:
- settings->tapgesture_sensibility = fTapSlider->Value();
+ settings.tapgesture_sensibility = fTapSlider->Value();
fRevertButton->SetEnabled(true);
fTouchpadPref.UpdateSettings();
break;
@@ -299,13 +300,13 @@
fTouchpadPref.Defaults();
fRevertButton->SetEnabled(true);
fTouchpadPref.UpdateSettings();
- SetValues(settings);
+ SetValues(&settings);
break;
case REVERT_SETTINGS:
fTouchpadPref.Revert();
fTouchpadPref.UpdateSettings();
fRevertButton->SetEnabled(false);
- SetValues(settings);
+ SetValues(&settings);
break;
default:
BView::MessageReceived(msg);
@@ -329,20 +330,17 @@
BSize size = PreferredSize();
Window()->ResizeTo(size.width, size.height);
- BRect rect = BScreen().Frame();
- BRect windowFrame = Window()->Frame();
BPoint position = fTouchpadPref.WindowPosition();
// center window on screen if it had a bad position
- if(position.x < 0 && position.y < 0){
- position.x = (rect.Width() - windowFrame.Width()) / 2;
- position.y = (rect.Height() - windowFrame.Height()) / 2;
- }
- Window()->MoveTo(position);
+ if (position.x < 0 && position.y < 0)
+ Window()->CenterOnScreen();
+ else
+ Window()->MoveTo(position);
}
void
-TouchpadPrefView::DetachedFromWindow(void)
+TouchpadPrefView::DetachedFromWindow()
{
fTouchpadPref.SetWindowPosition(Window()->Frame().LeftTop());
}
@@ -354,7 +352,7 @@
SetLayout(new BGroupLayout(B_VERTICAL));
BRect rect = Bounds();
rect.InsetBy(5, 5);
- BBox *scrollBox = new BBox(rect, "Touchpad");
+ BBox* scrollBox = new BBox(rect, "Touchpad");
scrollBox->SetLabel("Scrolling");
SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
@@ -362,26 +360,30 @@
fTouchpadView->SetExplicitMaxSize(BSize(130, 120));
// Create the "Mouse Speed" slider...
- fScrollAccelSlider = new BSlider(rect, "scroll_accel", "Scroll
Acceleration",
- new BMessage(SCROLL_CONTROL_CHANGED), 0, 20);
+ fScrollAccelSlider = new BSlider(rect, "scroll_accel",
+ "Scroll Acceleration", new BMessage(SCROLL_CONTROL_CHANGED), 0,
20);
fScrollAccelSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
fScrollAccelSlider->SetHashMarkCount(7);
fScrollAccelSlider->SetLimitLabels("Slow", "Fast");
- fScrollStepXSlider = new BSlider(rect, "scroll_stepX", "Horizontal
Scroll Stepsize",
- new BMessage(SCROLL_CONTROL_CHANGED), 0, 20);
+ fScrollStepXSlider = new BSlider(rect, "scroll_stepX",
+ "Horizontal Scroll Step Size", new
BMessage(SCROLL_CONTROL_CHANGED), 0,
+ 20);
fScrollStepXSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
fScrollStepXSlider->SetHashMarkCount(7);
fScrollStepXSlider->SetLimitLabels("Wide", "Small");
- fScrollStepYSlider = new BSlider(rect, "scroll_stepY", "Vertical Scroll
Stepsize",
- new BMessage(SCROLL_CONTROL_CHANGED), 0, 20);
+ fScrollStepYSlider = new BSlider(rect, "scroll_stepY",
+ "Vertical Scroll Step Size", new
BMessage(SCROLL_CONTROL_CHANGED), 0,
+ 20);
fScrollStepYSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
fScrollStepYSlider->SetHashMarkCount(7);
fScrollStepYSlider->SetLimitLabels("Wide", "Small");
- fTwoFingerBox = new BCheckBox("Two Finger Scrolling", new
BMessage(SCROLL_CONTROL_CHANGED));
- fMultiFingerBox = new BCheckBox("Multi Finger Scrolling", new
BMessage(SCROLL_CONTROL_CHANGED));
+ fTwoFingerBox = new BCheckBox("Two Finger Scrolling",
+ new BMessage(SCROLL_CONTROL_CHANGED));
+ fMultiFingerBox = new BCheckBox("Multi Finger Scrolling",
+ new BMessage(SCROLL_CONTROL_CHANGED));
BGroupView* scrollPrefLeftLayout = new BGroupView(B_VERTICAL);
scrollPrefLeftLayout->AddChild(fTouchpadView);
@@ -395,14 +397,15 @@
BGroupLayout* scrollPrefLayout = new BGroupLayout(B_HORIZONTAL);
scrollPrefLayout->SetSpacing(10);
- scrollPrefLayout->SetInsets(10, scrollBox->TopBorderOffset() * 2 + 10,
10, 10);
+ scrollPrefLayout->SetInsets(10, scrollBox->TopBorderOffset() * 2 + 10,
10,
+ 10);
scrollBox->SetLayout(scrollPrefLayout);
scrollPrefLayout->AddView(scrollPrefLeftLayout);
scrollPrefLayout->AddItem(BSpaceLayoutItem::CreateVerticalStrut(15));
scrollPrefLayout->AddView(scrollPrefRightLayout);
- BBox *tapBox = new BBox(rect, "tapbox");
+ BBox* tapBox = new BBox(rect, "tapbox");
tapBox->SetLabel("Tap Gesture");
BGroupLayout* tapPrefLayout = new BGroupLayout(B_HORIZONTAL);
@@ -418,13 +421,12 @@
tapPrefLayout->AddView(fTapSlider);
BGroupView* buttonView = new BGroupView(B_HORIZONTAL);
- fDefaultButton = new BButton("Defaults",
-
new BMessage(DEFAULT_SETTINGS));
+ fDefaultButton = new BButton("Defaults", new
BMessage(DEFAULT_SETTINGS));
buttonView->AddChild(fDefaultButton);
-
buttonView->GetLayout()->AddItem(BSpaceLayoutItem::CreateHorizontalStrut(7));
- fRevertButton = new BButton("Revert",
-
new BMessage(REVERT_SETTINGS));
+ buttonView->GetLayout()->AddItem(
+ BSpaceLayoutItem::CreateHorizontalStrut(7));
+ fRevertButton = new BButton("Revert", new BMessage(REVERT_SETTINGS));
fRevertButton->SetEnabled(false);
buttonView->AddChild(fRevertButton);
buttonView->GetLayout()->AddItem(BSpaceLayoutItem::CreateGlue());
@@ -444,11 +446,14 @@
void
-TouchpadPrefView::SetValues(touchpad_settings *settings)
+TouchpadPrefView::SetValues(touchpad_settings* settings)
{
- fTouchpadView->SetValues(settings->scroll_rightrange,
settings->scroll_bottomrange);
- fTwoFingerBox->SetValue(settings->scroll_twofinger ? B_CONTROL_ON :
B_CONTROL_OFF);
- fMultiFingerBox->SetValue(settings->scroll_multifinger ? B_CONTROL_ON :
B_CONTROL_OFF);
+ fTouchpadView->SetValues(settings->scroll_rightrange,
+ settings->scroll_bottomrange);
+ fTwoFingerBox->SetValue(settings->scroll_twofinger
+ ? B_CONTROL_ON : B_CONTROL_OFF);
+ fMultiFingerBox->SetValue(settings->scroll_multifinger
+ ? B_CONTROL_ON : B_CONTROL_OFF);
fScrollStepXSlider->SetValue(20 - settings->scroll_xstepsize / 2);
fScrollStepYSlider->SetValue(20 - settings->scroll_ystepsize / 2);
fScrollAccelSlider->SetValue(settings->scroll_acceleration);
Modified: haiku/trunk/src/preferences/touchpad/TouchpadPrefView.h
===================================================================
--- haiku/trunk/src/preferences/touchpad/TouchpadPrefView.h 2009-10-06
07:52:09 UTC (rev 33448)
+++ haiku/trunk/src/preferences/touchpad/TouchpadPrefView.h 2009-10-06
08:19:49 UTC (rev 33449)
@@ -1,6 +1,14 @@
-#ifndef TouchpadPrefView_h
-#define TouchpadPrefView_h
+/*
+ * Copyright 2008-2009, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * Clemens Zeidler (haiku@xxxxxxxxxxxxxxxxxx)
+ */
+#ifndef TOUCHPAD_PREF_VIEW_H
+#define TOUCHPAD_PREF_VIEW_H
+
#include <Bitmap.h>
#include <Button.h>
#include <CheckBox.h>
@@ -27,72 +35,73 @@
const uint REVERT_SETTINGS = '&rse';
-// draw a touchpad
-class TouchpadView : public BView, public BInvoker
-{
- public:
- TouchpadView(BRect frame);
- ~TouchpadView();
- virtual void Draw(BRect updateRect);
- virtual void MouseDown(BPoint point);
- virtual void MouseUp(BPoint point);
- virtual void MouseMoved(BPoint point, uint32 transit, const
BMessage *message);
-
- virtual void AttachedToWindow();
- virtual void GetPreferredSize(float *width, float *height);
-
- void SetValues(float rightRange, float
bottomRange);
- float GetRightScrollRatio(){ return (1 -
fXScrollRange / fPadRect.Width()); };
- float GetBottomScrollRatio(){ return (1 -
fYScrollRange / fPadRect.Height()); };
- private:
-
- virtual void DrawSliders();
- BRect fPrefRect;
- BRect fPadRect;
- BRect fXScrollDragZone;
- BRect fXScrollDragZone1;
- BRect fXScrollDragZone2;
- float fXScrollRange;
- float fOldXScrollRange;
- BRect fYScrollDragZone;
- BRect fYScrollDragZone1;
- BRect fYScrollDragZone2;
- float fYScrollRange;
- float fOldYScrollRange;
-
- bool fXTracking;
- bool fYTracking;
- BView *fOffScreenView;
- BBitmap *fOffScreenBitmap;
+//! Shows a touchpad
+class TouchpadView : public BView, public BInvoker {
+public:
+ TouchpadView(BRect
frame);
+ virtual ~TouchpadView();
+ virtual void Draw(BRect updateRect);
+ virtual void MouseDown(BPoint point);
+ virtual void MouseUp(BPoint point);
+ virtual void MouseMoved(BPoint point, uint32 transit,
+ const BMessage*
dragMessage);
+
+ virtual void AttachedToWindow();
+ virtual void GetPreferredSize(float* width, float*
height);
+
+ void SetValues(float rightRange,
float bottomRange);
+ float GetRightScrollRatio()
+ { return 1 -
fXScrollRange / fPadRect.Width(); }
+ float GetBottomScrollRatio()
+ { return 1
+ -
fYScrollRange / fPadRect.Height(); }
+private:
+ virtual void DrawSliders();
+
+ BRect fPrefRect;
+ BRect fPadRect;
+ BRect fXScrollDragZone;
+ BRect fXScrollDragZone1;
+ BRect fXScrollDragZone2;
+ float fXScrollRange;
+ float fOldXScrollRange;
+ BRect fYScrollDragZone;
+ BRect fYScrollDragZone1;
+ BRect fYScrollDragZone2;
+ float fYScrollRange;
+ float fOldYScrollRange;
+
+ bool fXTracking;
+ bool fYTracking;
+ BView* fOffScreenView;
+ BBitmap* fOffScreenBitmap;
};
-class TouchpadPrefView : public BView
-{
- public:
- TouchpadPrefView(BRect
frame, const char *name);
- ~TouchpadPrefView();
- virtual void MessageReceived(BMessage *msg);
- virtual void AttachedToWindow();
- virtual void DetachedFromWindow(void);
- void SetupView();
-
- void SetValues(touchpad_settings
*settings);
-
- private:
- // visual the touchpad
- TouchpadView* fTouchpadView;
- BCheckBox* fTwoFingerBox;
- BCheckBox* fMultiFingerBox;
- BSlider* fScrollStepXSlider;
- BSlider* fScrollStepYSlider;
- BSlider* fScrollAccelSlider;
- BSlider* fTapSlider;
- BButton* fDefaultButton;
- BButton* fRevertButton;
-
- TouchpadPref fTouchpadPref;
+class TouchpadPrefView : public BView {
+public:
+ TouchpadPrefView(BRect
frame, const char* name);
+ virtual ~TouchpadPrefView();
+ virtual void MessageReceived(BMessage* msg);
+ virtual void AttachedToWindow();
+ virtual void DetachedFromWindow();
+ void SetupView();
+
+ void SetValues(touchpad_settings
*settings);
+
+private:
+ TouchpadView* fTouchpadView;
+ BCheckBox* fTwoFingerBox;
+ BCheckBox* fMultiFingerBox;
+ BSlider* fScrollStepXSlider;
+ BSlider* fScrollStepYSlider;
+ BSlider* fScrollAccelSlider;
+ BSlider* fTapSlider;
+ BButton* fDefaultButton;
+ BButton* fRevertButton;
+
+ TouchpadPref fTouchpadPref;
};
-#endif
\ No newline at end of file
+#endif // TOUCHPAD_PREF_VIEW_H
Modified: haiku/trunk/src/preferences/touchpad/main.cpp
===================================================================
--- haiku/trunk/src/preferences/touchpad/main.cpp 2009-10-06 07:52:09 UTC
(rev 33448)
+++ haiku/trunk/src/preferences/touchpad/main.cpp 2009-10-06 08:19:49 UTC
(rev 33449)
@@ -1,39 +1,46 @@
-//Autor: Clemens Zeidler czeidler@xxxxxx
-//licence: MIT
+/*
+ * Copyright 2008-2009, Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ * Clemens Zeidler (haiku@xxxxxxxxxxxxxxxxxx)
+ */
-#include "TouchpadPrefView.h"
+
#include <Application.h>
#include <Window.h>
+#include "TouchpadPrefView.h"
-class TouchpadPrefWindow : public BWindow
-{
- public:
- TouchpadPrefWindow(BRect frame,
- const char *title,
- window_type type,
- uint32 flags)
- :BWindow(frame, title,
type, flags)
- {}
-
- virtual bool QuitRequested()
- {
- be_app->PostMessage(B_QUIT_REQUESTED);
- return true;
- }
+
+class TouchpadPrefWindow : public BWindow {
+public:
+ TouchpadPrefWindow(BRect frame, const char* title, window_type type,
+ uint32 flags)
+ : BWindow(frame, title, type, flags)
+ {
+ }
+
+ virtual bool QuitRequested()
+ {
+ be_app->PostMessage(B_QUIT_REQUESTED);
+ return true;
+ }
};
-int
+int
main(int argc, char* argv[])
{
- BApplication *app = new
BApplication("application/x-vnd.Haiku-Touchpad");
- TouchpadPrefWindow *window = new TouchpadPrefWindow(BRect(50, 50, 450,
350),"Touchpad", B_TITLED_WINDOW,
- B_NOT_RESIZABLE | B_NOT_ZOOMABLE |
B_AVOID_FRONT | B_ASYNCHRONOUS_CONTROLS);
- window->AddChild(new TouchpadPrefView(window->Bounds(),
"TouchpadPrefView"));
+ BApplication* app = new
BApplication("application/x-vnd.Haiku-Touchpad");
+ TouchpadPrefWindow* window = new TouchpadPrefWindow(BRect(50, 50, 450,
350),
+ "Touchpad", B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE
+ | B_ASYNCHRONOUS_CONTROLS);
+ window->AddChild(
+ new TouchpadPrefView(window->Bounds(), "TouchpadPrefView"));
window->Show();
app->Run();
-
+
delete app;
return 0;
}
Other related posts:
- » [haiku-commits] r33449 - haiku/trunk/src/preferences/touchpad - axeld
