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

fixed warnings (gcc4). Style fixes.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27296 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2008-09-03 10:01:58 +00:00
parent 25d466ba72
commit 6e7954eb07
1 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/kits/game/chart/ChartView.cpp
+41 -26
View File
@@ -14,67 +14,82 @@
#include "ChartView.h" #include "ChartView.h"
#include "ChartWindow.h" #include "ChartWindow.h"
/* Straightforward constructor */
ChartView::ChartView(BRect rect) : ChartView::ChartView(BRect rect)
BView(rect, "", B_FOLLOW_ALL, B_WILL_DRAW) {;} :
BView(rect, "", B_FOLLOW_ALL, B_WILL_DRAW)
{
}
/* The drawing function just draw the offscreen if it exists and is used */ /* The drawing function just draw the offscreen if it exists and is used */
void ChartView::Draw(BRect r) void
ChartView::Draw(BRect rect)
{ {
ChartWindow *w; ChartWindow *window = dynamic_cast<ChartWindow *>(Window());
if ((window->fOffscreen != 0) && (window->fCurrentSettings.display == DISPLAY_BITMAP))
w = dynamic_cast<ChartWindow *>(Window()); DrawBitmap(window->fOffscreen, rect, rect);
if ((w->fOffscreen != 0) && (w->fCurrentSettings.display == DISPLAY_BITMAP))
DrawBitmap(w->fOffscreen, r, r);
} }
/* Send a message to the window if the user click anywhere in the animation /* Send a message to the window if the user click anywhere in the animation
view. This is used to go out of fullscreen demo mode. */ view. This is used to go out of fullscreen demo mode. */
void ChartView::MouseDown(BPoint where) void
ChartView::MouseDown(BPoint where)
{ {
Window()->PostMessage(BACK_DEMO_MSG); Window()->PostMessage(BACK_DEMO_MSG);
} }
/* Another straightforward constructor. The default target setting for the /* Another straightforward constructor. The default target setting for the
frames/s vue-meter is 5 (as 5 * 12 = 60 frames/s) */ frames/s vue-meter is 5 (as 5 * 12 = 60 frames/s) */
InstantView::InstantView(BRect rect) : InstantView::InstantView(BRect rect)
BView(rect, "", B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW) :
BView(rect, "", B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW)
{ {
step = 5; step = 5;
} }
/* Draw the colored bars of the vue-meter depending the current framerate /* Draw the colored bars of the vue-meter depending the current framerate
of the window animation. The color coding depends of the target framerate of the window animation. The color coding depends of the target framerate
as encoded by step. */ as encoded by step. */
void InstantView::Draw(BRect r) void
InstantView::Draw(BRect rect)
{ {
ChartWindow *w = dynamic_cast<ChartWindow *>(Window()); ChartWindow *window = dynamic_cast<ChartWindow *>(Window());
for (int32 i=0; i< w->fInstantLoadLevel; i++) { for (int32 i = 0; i < window->fInstantLoadLevel; i++) {
if (i<step) SetHighColor(255.0, 90.0, 90.0); if (i < step)
else if ((i/step) & 1) SetHighColor(90.0, 255.0, 90.0); SetHighColor(255, 90, 90);
else SetHighColor(40.0, 200.0, 40.0); else if ((i / step) & 1)
FillRect(BRect(3+i*4, 2, 5+i*4, 19)); SetHighColor(90, 255, 90);
else
SetHighColor(40, 200, 40);
FillRect(BRect(3 + i * 4, 2, 5 + i * 4, 19));
} }
Flush(); Flush();
} }
/* Straightforward constructor */
ChartColorControl::ChartColorControl(BPoint start, BMessage *message) : ChartColorControl::ChartColorControl(BPoint start, BMessage *message)
BColorControl(start, B_CELLS_32x8, 8.0, "", message) :
BColorControl(start, B_CELLS_32x8, 8.0, "", message)
{ {
} }
/* We overwrite SetValue to send a message to the target everytime /* We overwrite SetValue to send a message to the target everytime
the setting change and not only at the end. */ the setting change and not only at the end. */
void ChartColorControl::SetValue(int32 color_value) void
ChartColorControl::SetValue(int32 colorValue)
{ {
BLooper *looper; BLooper *looper;
BColorControl::SetValue(color_value); BColorControl::SetValue(colorValue);
Target(&looper); Target(&looper);
if (looper) { if (looper) {
BMessage msg(*Message()); BMessage msg(*Message());
msg.AddInt32("be:value", color_value); msg.AddInt32("be:value", colorValue);
looper->PostMessage(&msg); looper->PostMessage(&msg);
} }
} }