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

Renamed the last member variables to be style guide compliant.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5968 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-01-07 08:26:51 +00:00
parent b2322fd1e0
commit 19a5b61308
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/prefs/mouse/SettingsView.cpp
+18 -18
View File
@@ -103,30 +103,30 @@ SettingsView::SettingsView(BRect rect, MouseSettings &settings)
// Create the "Double-click speed slider... // Create the "Double-click speed slider...
frame.Set(166, 11, 328, 50); frame.Set(166, 11, 328, 50);
dcSpeedSlider = new BSlider(frame, "double_click_speed", "Double-click speed", fClickSpeedSlider = new BSlider(frame, "double_click_speed", "Double-click speed",
new BMessage(SLIDER_DOUBLE_CLICK_SPEED), 0, 1000); new BMessage(SLIDER_DOUBLE_CLICK_SPEED), 0, 1000);
dcSpeedSlider->SetHashMarks(B_HASH_MARKS_BOTTOM); fClickSpeedSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
dcSpeedSlider->SetHashMarkCount(5); fClickSpeedSlider->SetHashMarkCount(5);
dcSpeedSlider->SetLimitLabels("Slow", "Fast"); fClickSpeedSlider->SetLimitLabels("Slow", "Fast");
AddChild(dcSpeedSlider); AddChild(fClickSpeedSlider);
// Create the "Mouse Speed" slider... // Create the "Mouse Speed" slider...
frame.Set(166,76,328,125); frame.Set(166,76,328,125);
mouseSpeedSlider = new BSlider(frame, "mouse_speed", "Mouse Speed", fMouseSpeedSlider = new BSlider(frame, "mouse_speed", "Mouse Speed",
new BMessage(SLIDER_MOUSE_SPEED), 0, 1000); new BMessage(SLIDER_MOUSE_SPEED), 0, 1000);
mouseSpeedSlider->SetHashMarks(B_HASH_MARKS_BOTTOM); fMouseSpeedSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
mouseSpeedSlider->SetHashMarkCount(7); fMouseSpeedSlider->SetHashMarkCount(7);
mouseSpeedSlider->SetLimitLabels("Slow", "Fast"); fMouseSpeedSlider->SetLimitLabels("Slow", "Fast");
AddChild(mouseSpeedSlider); AddChild(fMouseSpeedSlider);
// Create the "Mouse Acceleration" slider... // Create the "Mouse Acceleration" slider...
frame.Set(166, 141, 328, 190); frame.Set(166, 141, 328, 190);
mouseAccSlider = new BSlider(frame, "mouse_acceleration", "Mouse Acceleration", fAccelerationSlider = new BSlider(frame, "mouse_acceleration", "Mouse Acceleration",
new BMessage(SLIDER_MOUSE_ACC), 0, 1000); new BMessage(SLIDER_MOUSE_ACC), 0, 1000);
mouseAccSlider->SetHashMarks(B_HASH_MARKS_BOTTOM); fAccelerationSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
mouseAccSlider->SetHashMarkCount(5); fAccelerationSlider->SetHashMarkCount(5);
mouseAccSlider->SetLimitLabels("Slow", "Fast"); fAccelerationSlider->SetLimitLabels("Slow", "Fast");
AddChild(mouseAccSlider); AddChild(fAccelerationSlider);
// Create the "Double-click test area" text box... // Create the "Double-click test area" text box...
frame = Bounds(); frame = Bounds();
@@ -213,15 +213,15 @@ SettingsView::UpdateFromSettings()
{ {
int32 value = int32(fSettings.ClickSpeed() / 1000); int32 value = int32(fSettings.ClickSpeed() / 1000);
// slow = 1000000, fast = 0 // slow = 1000000, fast = 0
dcSpeedSlider->SetValue(value); fClickSpeedSlider->SetValue(value);
value = int32((log(fSettings.MouseSpeed() / 8192) / log(2)) * 1000 / 6); value = int32((log(fSettings.MouseSpeed() / 8192) / log(2)) * 1000 / 6);
// slow = 8192, fast = 524287 // slow = 8192, fast = 524287
mouseSpeedSlider->SetValue(value); fMouseSpeedSlider->SetValue(value);
value = int32(sqrt(fSettings.AccelerationFactor() / 16384) * 1000 / 4); value = int32(sqrt(fSettings.AccelerationFactor() / 16384) * 1000 / 4);
// slow = 0, fast = 262144 // slow = 0, fast = 262144
mouseAccSlider->SetValue(value); fAccelerationSlider->SetValue(value);
BMenuItem *item = fTypeMenu->ItemAt(fSettings.MouseType() - 1); BMenuItem *item = fTypeMenu->ItemAt(fSettings.MouseType() - 1);
if (item != NULL) if (item != NULL)
src/prefs/mouse/SettingsView.h
+1 -1
View File
@@ -48,7 +48,7 @@ class SettingsView : public BBox {
BPopUpMenu *fTypeMenu, *fFocusMenu; BPopUpMenu *fTypeMenu, *fFocusMenu;
MouseView *fMouseView; MouseView *fMouseView;
BSlider *dcSpeedSlider, *mouseSpeedSlider, *mouseAccSlider; BSlider *fClickSpeedSlider, *fMouseSpeedSlider, *fAccelerationSlider;
BBitmap *fDoubleClickBitmap, *fSpeedBitmap, *fAccelerationBitmap; BBitmap *fDoubleClickBitmap, *fSpeedBitmap, *fAccelerationBitmap;
}; };