fixing indenting style issues
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20243 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
@@ -151,7 +151,7 @@ BackgroundImage::GetBackgroundImage(const BNode *node, bool isDesktop,
|
||||
result->fImageSetPeriod = imageSetPeriod;
|
||||
result->fCacheMode = globalCacheMode;
|
||||
if (result->fImageSetCount > 1)
|
||||
result->fShowingImageSet = random()%result->fImageSetCount;
|
||||
result->fShowingImageSet = random() % result->fImageSetCount;
|
||||
}
|
||||
|
||||
return result;
|
||||
@@ -289,16 +289,16 @@ BackgroundImage::Show(BackgroundImageInfo *info, BView *view)
|
||||
}
|
||||
// else fall thru
|
||||
case kAtOffset:
|
||||
{
|
||||
destinationBitmapBounds.OffsetTo(offset);
|
||||
break;
|
||||
}
|
||||
{
|
||||
destinationBitmapBounds.OffsetTo(offset);
|
||||
break;
|
||||
}
|
||||
case kTiled:
|
||||
// Original Backgrounds Preferences center the tiled paper but the Tracker don't do that
|
||||
//if (fIsDesktop) {
|
||||
destinationBitmapBounds.OffsetBy(
|
||||
(viewBounds.Width() - destinationBitmapBounds.Width()) / 2,
|
||||
(viewBounds.Height() - destinationBitmapBounds.Height()) / 2);
|
||||
destinationBitmapBounds.OffsetBy(
|
||||
(viewBounds.Width() - destinationBitmapBounds.Width()) / 2,
|
||||
(viewBounds.Height() - destinationBitmapBounds.Height()) / 2);
|
||||
//}
|
||||
tile = B_TILE_BITMAP;
|
||||
break;
|
||||
@@ -440,7 +440,7 @@ BackgroundImage::SetBackgroundImage(BNode *node)
|
||||
PRINT_OBJECT(container);
|
||||
|
||||
size_t flattenedSize = container.FlattenedSize();
|
||||
char* buffer = new (std::nothrow) char[flattenedSize];
|
||||
char* buffer = new(std::nothrow) char[flattenedSize];
|
||||
if (buffer == NULL)
|
||||
return B_NO_MEMORY;
|
||||
|
||||
|
||||
@@ -66,92 +66,92 @@ const uint32 kRestoreBackgroundImage = 'Tbgr';
|
||||
const uint32 kChangeBackgroundImage = 'Cbgr';
|
||||
|
||||
class BackgroundImage {
|
||||
// This class knows everything about which bitmap to use for a given
|
||||
// view and how.
|
||||
// Unlike other windows, the Desktop window can have different backgrounds
|
||||
// for each workspace
|
||||
public:
|
||||
|
||||
enum Mode {
|
||||
kAtOffset,
|
||||
kCentered, // only works on Desktop
|
||||
kScaledToFit, // only works on Desktop
|
||||
kTiled
|
||||
};
|
||||
|
||||
class BackgroundImageInfo {
|
||||
// element of the per-workspace list
|
||||
// This class knows everything about which bitmap to use for a given
|
||||
// view and how.
|
||||
// Unlike other windows, the Desktop window can have different backgrounds
|
||||
// for each workspace
|
||||
public:
|
||||
BackgroundImageInfo(uint32 workspace, int32 imageIndex, Mode mode,
|
||||
BPoint offset, bool eraseTextWidget, uint32 imageSet,
|
||||
uint32 cacheMode);
|
||||
~BackgroundImageInfo();
|
||||
|
||||
void LoadBitmap();
|
||||
void UnloadBitmap(uint32 globalCacheMode);
|
||||
enum Mode {
|
||||
kAtOffset,
|
||||
kCentered, // only works on Desktop
|
||||
kScaledToFit, // only works on Desktop
|
||||
kTiled
|
||||
};
|
||||
|
||||
uint32 fWorkspace;
|
||||
int32 fImageIndex;
|
||||
Mode fMode;
|
||||
BPoint fOffset;
|
||||
bool fEraseTextWidgetBackground;
|
||||
uint32 fImageSet;
|
||||
uint32 fCacheMode; // image cache strategy (0 cache , 1 no cache)
|
||||
};
|
||||
class BackgroundImageInfo {
|
||||
// element of the per-workspace list
|
||||
public:
|
||||
BackgroundImageInfo(uint32 workspace, int32 imageIndex, Mode mode,
|
||||
BPoint offset, bool eraseTextWidget, uint32 imageSet,
|
||||
uint32 cacheMode);
|
||||
~BackgroundImageInfo();
|
||||
|
||||
static BackgroundImage *GetBackgroundImage(const BNode *node,
|
||||
bool isDesktop, BackgroundsView* view);
|
||||
void LoadBitmap();
|
||||
void UnloadBitmap(uint32 globalCacheMode);
|
||||
|
||||
uint32 fWorkspace;
|
||||
int32 fImageIndex;
|
||||
Mode fMode;
|
||||
BPoint fOffset;
|
||||
bool fEraseTextWidgetBackground;
|
||||
uint32 fImageSet;
|
||||
uint32 fCacheMode; // image cache strategy (0 cache , 1 no cache)
|
||||
};
|
||||
|
||||
static BackgroundImage *GetBackgroundImage(const BNode *node,
|
||||
bool isDesktop, BackgroundsView* view);
|
||||
// create a BackgroundImage object by reading it from a node
|
||||
|
||||
virtual ~BackgroundImage();
|
||||
virtual ~BackgroundImage();
|
||||
|
||||
void Show(BView *view, int32 workspace);
|
||||
void Show(BView *view, int32 workspace);
|
||||
// display the right background for a given workspace
|
||||
void Remove();
|
||||
void Remove();
|
||||
// remove the background from it's current view
|
||||
|
||||
void WorkspaceActivated(BView *view, int32 workspace, bool state);
|
||||
void WorkspaceActivated(BView *view, int32 workspace, bool state);
|
||||
// respond to a workspace change
|
||||
void ScreenChanged(BRect rect, color_space space);
|
||||
void ScreenChanged(BRect rect, color_space space);
|
||||
// respond to a screen size change
|
||||
/*static BackgroundImage *Refresh(BackgroundImage *oldBackgroundImage,
|
||||
const BNode *fromNode, bool desktop, BPoseView *poseView);
|
||||
// respond to a background image setting change
|
||||
void ChangeImageSet(BPoseView *poseView);
|
||||
// change to the next imageSet if any, no refresh*/
|
||||
BackgroundImageInfo *ImageInfoForWorkspace(int32) const;
|
||||
/*static BackgroundImage *Refresh(BackgroundImage *oldBackgroundImage,
|
||||
const BNode *fromNode, bool desktop, BPoseView *poseView);
|
||||
// respond to a background image setting change
|
||||
void ChangeImageSet(BPoseView *poseView);
|
||||
// change to the next imageSet if any, no refresh*/
|
||||
BackgroundImageInfo *ImageInfoForWorkspace(int32) const;
|
||||
|
||||
// return fIsDesktop
|
||||
bool IsDesktop() { return fIsDesktop;}
|
||||
bool IsDesktop() { return fIsDesktop;}
|
||||
|
||||
status_t SetBackgroundImage(BNode *node);
|
||||
status_t SetBackgroundImage(BNode *node);
|
||||
|
||||
void Show(BackgroundImageInfo *, BView *view);
|
||||
void Show(BackgroundImageInfo *, BView *view);
|
||||
|
||||
uint32 GetShowingImageSet() { return fShowingImageSet; }
|
||||
uint32 GetShowingImageSet() { return fShowingImageSet; }
|
||||
|
||||
void Add(BackgroundImageInfo *);
|
||||
void Remove(BackgroundImageInfo *);
|
||||
void RemoveAll();
|
||||
void Add(BackgroundImageInfo *);
|
||||
void Remove(BackgroundImageInfo *);
|
||||
void RemoveAll();
|
||||
|
||||
private:
|
||||
BackgroundImage(const BNode *node, bool isDesktop, BackgroundsView* view);
|
||||
private:
|
||||
BackgroundImage(const BNode *node, bool isDesktop, BackgroundsView* view);
|
||||
// no public constructor, GetBackgroundImage factory function is
|
||||
// used instead
|
||||
|
||||
bool fIsDesktop;
|
||||
BNode fDefinedByNode;
|
||||
BView *fView;
|
||||
BackgroundsView* fBackgroundsView;
|
||||
BackgroundImageInfo *fShowingBitmap;
|
||||
bool fIsDesktop;
|
||||
BNode fDefinedByNode;
|
||||
BView *fView;
|
||||
BackgroundsView* fBackgroundsView;
|
||||
BackgroundImageInfo *fShowingBitmap;
|
||||
|
||||
BObjectList<BackgroundImageInfo> fBitmapForWorkspaceList;
|
||||
BObjectList<BackgroundImageInfo> fBitmapForWorkspaceList;
|
||||
|
||||
uint32 fImageSetPeriod; // period between imagesets, 0 if none
|
||||
uint32 fShowingImageSet; // current imageset
|
||||
uint32 fImageSetCount; // imageset count
|
||||
uint32 fCacheMode;// image cache strategy (0 all, 1 none, 2 own strategy)
|
||||
bool fRandomChange; // random or sequential change
|
||||
uint32 fImageSetPeriod; // period between imagesets, 0 if none
|
||||
uint32 fShowingImageSet; // current imageset
|
||||
uint32 fImageSetCount; // imageset count
|
||||
uint32 fCacheMode;// image cache strategy (0 all, 1 none, 2 own strategy)
|
||||
bool fRandomChange; // random or sequential change
|
||||
};
|
||||
|
||||
class Image {
|
||||
|
||||
@@ -55,7 +55,7 @@ BackgroundsApplication::BackgroundsApplication()
|
||||
BackgroundsWindow::BackgroundsWindow(BRect frame, bool standalone)
|
||||
: BWindow(frame, "Backgrounds", B_TITLED_WINDOW,
|
||||
B_NOT_RESIZABLE | B_NOT_ZOOMABLE, B_ALL_WORKSPACES),
|
||||
fIsStandalone(standalone)
|
||||
fIsStandalone(standalone)
|
||||
{
|
||||
fBackgroundsView = new BackgroundsView(Bounds(), "BackgroundsView",
|
||||
B_FOLLOW_ALL, B_WILL_DRAW);
|
||||
|
||||
@@ -51,44 +51,44 @@ static const uint32 kMsgUpdatePreviewPlacement = 'pvpl';
|
||||
const uint8 kHandCursorData[68] = {
|
||||
16, 1, 2, 2,
|
||||
|
||||
0,0, // 0000000000000000
|
||||
7,128, // 0000011110000000
|
||||
61,112, // 0011110101110000
|
||||
37,40, // 0010010100101000
|
||||
36,168, // 0010010010101000
|
||||
18,148, // 0001001010010100
|
||||
18,84, // 0001001001010100
|
||||
9,42, // 0000100100101010
|
||||
8,1, // 0000100000000001
|
||||
60,1, // 0011110000000001
|
||||
76,1, // 0100110000000001
|
||||
66,1, // 0100001000000001
|
||||
48,1, // 0011000000000001
|
||||
12,1, // 0000110000000001
|
||||
2,0, // 0000001000000000
|
||||
1,0, // 0000000100000000
|
||||
0, 0, // 0000000000000000
|
||||
7, 128, // 0000011110000000
|
||||
61, 112, // 0011110101110000
|
||||
37, 40, // 0010010100101000
|
||||
36, 168, // 0010010010101000
|
||||
18, 148, // 0001001010010100
|
||||
18, 84, // 0001001001010100
|
||||
9, 42, // 0000100100101010
|
||||
8, 1, // 0000100000000001
|
||||
60, 1, // 0011110000000001
|
||||
76, 1, // 0100110000000001
|
||||
66, 1, // 0100001000000001
|
||||
48, 1, // 0011000000000001
|
||||
12, 1, // 0000110000000001
|
||||
2, 0, // 0000001000000000
|
||||
1, 0, // 0000000100000000
|
||||
|
||||
0,0, // 0000000000000000
|
||||
7,128, // 0000011110000000
|
||||
63,240, // 0011111111110000
|
||||
63,248, // 0011111111111000
|
||||
63,248, // 0011111111111000
|
||||
31,252, // 0001111111111100
|
||||
31,252, // 0001111111111100
|
||||
15,254, // 0000111111111110
|
||||
15,255, // 0000111111111111
|
||||
63,255, // 0011111111111111
|
||||
127,255, // 0111111111111111
|
||||
127,255, // 0111111111111111
|
||||
63,255, // 0011111111111111
|
||||
15,255, // 0000111111111111
|
||||
3,254, // 0000001111111110
|
||||
1,248 // 0000000111111000
|
||||
0, 0, // 0000000000000000
|
||||
7, 128, // 0000011110000000
|
||||
63, 240, // 0011111111110000
|
||||
63, 248, // 0011111111111000
|
||||
63, 248, // 0011111111111000
|
||||
31, 252, // 0001111111111100
|
||||
31, 252, // 0001111111111100
|
||||
15, 254, // 0000111111111110
|
||||
15, 255, // 0000111111111111
|
||||
63, 255, // 0011111111111111
|
||||
127, 255, // 0111111111111111
|
||||
127, 255, // 0111111111111111
|
||||
63, 255, // 0011111111111111
|
||||
15, 255, // 0000111111111111
|
||||
3, 254, // 0000001111111110
|
||||
1, 248 // 0000000111111000
|
||||
};
|
||||
|
||||
|
||||
BackgroundsView::BackgroundsView(BRect frame, const char *name, int32 resize,
|
||||
int32 flags)
|
||||
int32 flags)
|
||||
: BBox(frame, name, resize, flags | B_WILL_DRAW | B_FRAME_EVENTS, B_NO_BORDER),
|
||||
fCurrent(NULL),
|
||||
fCurrentInfo(NULL),
|
||||
@@ -527,7 +527,7 @@ BackgroundsView::UpdateWithCurrent(void)
|
||||
break;
|
||||
case BackgroundImage::kTiled:
|
||||
cmd = kMsgTilePlacement;
|
||||
break;
|
||||
break;
|
||||
}
|
||||
|
||||
if (cmd != 0)
|
||||
@@ -630,7 +630,7 @@ BackgroundsView::Save()
|
||||
|
||||
if (!fWorkspaceMenu->FindItem(kMsgCurrentWorkspace)->IsMarked()) {
|
||||
for (int32 i = 0; i < count_workspaces(); i++) {
|
||||
BScreen().SetDesktopColor(fPicker->ValueAsColor(), i, true);
|
||||
BScreen().SetDesktopColor(fPicker->ValueAsColor(), i, true);
|
||||
}
|
||||
} else
|
||||
BScreen().SetDesktopColor(fPicker->ValueAsColor(), true);
|
||||
@@ -692,7 +692,7 @@ BackgroundsView::NotifyServer()
|
||||
continue;
|
||||
|
||||
if (isCustomFolder) {
|
||||
// found a window with poses, ask for its path
|
||||
// found a window with poses, ask for its path
|
||||
msg.MakeEmpty();
|
||||
msg.what = B_GET_PROPERTY;
|
||||
msg.AddSpecifier("Path");
|
||||
@@ -702,7 +702,7 @@ BackgroundsView::NotifyServer()
|
||||
reply.MakeEmpty();
|
||||
tracker.SendMessage(&msg, &reply);
|
||||
|
||||
// go on with the next if this din't have a path
|
||||
// go on with the next if this din't have a path
|
||||
if (reply.what == B_MESSAGE_NOT_UNDERSTOOD)
|
||||
continue;
|
||||
|
||||
@@ -742,7 +742,7 @@ BackgroundsView::SaveSettings(void)
|
||||
BFile file(path.Path(), B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE);
|
||||
|
||||
BPoint point = Window()->Frame().LeftTop();
|
||||
if (fSettings.ReplacePoint("pos", point)!=B_OK)
|
||||
if (fSettings.ReplacePoint("pos", point) != B_OK)
|
||||
fSettings.AddPoint("pos", point);
|
||||
|
||||
entry_ref ref;
|
||||
@@ -814,7 +814,7 @@ BackgroundsView::LoadSettings()
|
||||
s << "Folder: " << path.Leaf();
|
||||
BMenuItem *item = new BMenuItem(s.String(),
|
||||
new BMessage(kMsgFolderSelected));
|
||||
fWorkspaceMenu->AddItem(item, -i-1+6);
|
||||
fWorkspaceMenu->AddItem(item, -i - 1 + 6);
|
||||
index++;
|
||||
}
|
||||
fWorkspaceMenu->SetTargetForItems(this);
|
||||
@@ -869,7 +869,7 @@ BackgroundsView::UpdatePreview()
|
||||
BackgroundImage::BackgroundImageInfo *info =
|
||||
new BackgroundImage::BackgroundImageInfo(0, index,
|
||||
FindPlacementMode(), BPoint(atoi(fXPlacementText->Text()),
|
||||
atoi(fYPlacementText->Text())),
|
||||
atoi(fYPlacementText->Text())),
|
||||
fIconLabelBackground->Value() == B_CONTROL_ON, 0, 0);
|
||||
if (info->fMode == BackgroundImage::kAtOffset) {
|
||||
fPreView->SetEnabled(true);
|
||||
@@ -910,7 +910,7 @@ BackgroundsView::FindPlacementMode()
|
||||
#ifndef __HAIKU__
|
||||
inline bool operator!=(const rgb_color& x, const rgb_color& y)
|
||||
{
|
||||
return (x.red!=y.red || x.blue!=y.blue || x.green!=y.green);
|
||||
return (x.red != y.red || x.blue != y.blue || x.green != y.green);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -924,12 +924,12 @@ BackgroundsView::UpdateButtons()
|
||||
hasChanged = true;
|
||||
} else if (fCurrentInfo) {
|
||||
if ((fIconLabelBackground->Value() == B_CONTROL_ON) ^
|
||||
fCurrentInfo->fEraseTextWidgetBackground) {
|
||||
fCurrentInfo->fEraseTextWidgetBackground) {
|
||||
hasChanged = true;
|
||||
} else if (FindPlacementMode() != fCurrentInfo->fMode) {
|
||||
hasChanged = true;
|
||||
} else if (fCurrentInfo->fImageIndex !=
|
||||
((BGImageMenuItem*)fImageMenu->FindMarked())->ImageIndex()) {
|
||||
((BGImageMenuItem*)fImageMenu->FindMarked())->ImageIndex()) {
|
||||
hasChanged = true;
|
||||
} else if (fCurrent->IsDesktop()
|
||||
&& ((fCurrentInfo->fWorkspace != B_ALL_WORKSPACES)
|
||||
@@ -987,12 +987,12 @@ BackgroundsView::RefsReceived(BMessage *msg)
|
||||
item = FindImageItem(index);
|
||||
fLastImageIndex = index;
|
||||
} else {
|
||||
const char* name = GetImage(-index-1)->GetName();
|
||||
item = new BGImageMenuItem(name, -index-1,
|
||||
const char* name = GetImage(-index - 1)->GetName();
|
||||
item = new BGImageMenuItem(name, -index - 1,
|
||||
new BMessage(kMsgImageSelected));
|
||||
AddItem(item);
|
||||
item->SetTarget(this);
|
||||
fLastImageIndex = -index-1;
|
||||
fLastImageIndex = -index - 1;
|
||||
}
|
||||
|
||||
item->SetMarked(true);
|
||||
@@ -1014,9 +1014,9 @@ BackgroundsView::RefsReceived(BMessage *msg)
|
||||
BString s;
|
||||
s << "Folder: " << path.Leaf();
|
||||
item = new BMenuItem(s.String(), new BMessage(kMsgFolderSelected));
|
||||
fWorkspaceMenu->AddItem(item, -index-1+6);
|
||||
fWorkspaceMenu->AddItem(item, -index - 1 + 6);
|
||||
item->SetTarget(this);
|
||||
fLastWorkspaceIndex = -index-1 + 6;
|
||||
fLastWorkspaceIndex = -index - 1 + 6;
|
||||
}
|
||||
|
||||
item->SetMarked(true);
|
||||
@@ -1031,7 +1031,7 @@ BackgroundsView::AddPath(BPath path)
|
||||
{
|
||||
int32 count = fPathList.CountItems();
|
||||
int32 index = 0;
|
||||
for(; index < count; index++) {
|
||||
for (; index < count; index++) {
|
||||
BPath *p = fPathList.ItemAt(index);
|
||||
int c = BString(p->Path()).ICompare(path.Path());
|
||||
if (c == 0)
|
||||
@@ -1041,7 +1041,7 @@ BackgroundsView::AddPath(BPath path)
|
||||
break;
|
||||
}
|
||||
fPathList.AddItem(new BPath(path), index);
|
||||
return -index-1;
|
||||
return -index - 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -1050,14 +1050,14 @@ BackgroundsView::AddImage(BPath path)
|
||||
{
|
||||
int32 count = fImageList.CountItems();
|
||||
int32 index = 0;
|
||||
for(; index < count; index++) {
|
||||
for (; index < count; index++) {
|
||||
Image *image = fImageList.ItemAt(index);
|
||||
if (image->GetPath() == path)
|
||||
return index;
|
||||
}
|
||||
|
||||
fImageList.AddItem(new Image(path));
|
||||
return -index-1;
|
||||
return -index - 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -1147,7 +1147,7 @@ PreView::MouseDown(BPoint point)
|
||||
if (IsEnabled() && Bounds().Contains(point)) {
|
||||
uint32 buttons;
|
||||
GetMouse(&point, &buttons);
|
||||
if(buttons & B_PRIMARY_MOUSE_BUTTON) {
|
||||
if (buttons & B_PRIMARY_MOUSE_BUTTON) {
|
||||
fOldPoint = point;
|
||||
SetTracking(true);
|
||||
BScreen().GetMode(&mode);
|
||||
@@ -1178,8 +1178,8 @@ PreView::MouseMoved(BPoint point, uint32 transit, const BMessage *message)
|
||||
|
||||
if (IsTracking()) {
|
||||
float x, y;
|
||||
x = fPoint.x + (point.x - fOldPoint.x)/ x_ratio;
|
||||
y = fPoint.y + (point.y - fOldPoint.y)/ y_ratio;
|
||||
x = fPoint.x + (point.x - fOldPoint.x) / x_ratio;
|
||||
y = fPoint.y + (point.y - fOldPoint.y) / y_ratio;
|
||||
bool min, max, mustSend = false;
|
||||
min = (x > -fImageBounds.Width());
|
||||
max = (x < mode.virtual_width);
|
||||
@@ -1245,42 +1245,42 @@ PreviewBox::Draw(BRect rect)
|
||||
rgb_color color = HighColor();
|
||||
|
||||
SetHighColor(LowColor());
|
||||
FillRect(BRect(9,19,141,127));
|
||||
FillRect(BRect(9, 19, 141, 127));
|
||||
|
||||
if (fIsDesktop) {
|
||||
BPoint points[] = {
|
||||
BPoint(11,19), BPoint(139,19), BPoint(141,21),
|
||||
BPoint(141,119), BPoint(139,121), BPoint(118,121),
|
||||
BPoint(118,126), BPoint(117,127), BPoint(33,127),
|
||||
BPoint(32,126), BPoint(32,121),BPoint(11,121),
|
||||
BPoint(9,119),BPoint(9,21),BPoint(11,19)
|
||||
BPoint(11, 19), BPoint(139, 19), BPoint(141, 21),
|
||||
BPoint(141, 119), BPoint(139, 121), BPoint(118, 121),
|
||||
BPoint(118, 126), BPoint(117, 127), BPoint(33, 127),
|
||||
BPoint(32, 126), BPoint(32, 121), BPoint(11, 121),
|
||||
BPoint(9, 119), BPoint(9, 21), BPoint(11, 19)
|
||||
};
|
||||
SetHighColor(184,184,184);
|
||||
SetHighColor(184, 184, 184);
|
||||
FillPolygon(points, 15);
|
||||
SetHighColor(96,96,96);
|
||||
SetHighColor(96, 96, 96);
|
||||
StrokePolygon(points, 15);
|
||||
FillRect(BRect(107,121,111,123));
|
||||
SetHighColor(0,0,0);
|
||||
StrokeRect(BRect(14,24,136,116));
|
||||
SetHighColor(0,255,0);
|
||||
FillRect(BRect(101,122,103,123));
|
||||
FillRect(BRect(107, 121, 111, 123));
|
||||
SetHighColor(0, 0, 0);
|
||||
StrokeRect(BRect(14, 24, 136, 116));
|
||||
SetHighColor(0, 255, 0);
|
||||
FillRect(BRect(101, 122, 103, 123));
|
||||
} else {
|
||||
SetHighColor(152,152,152);
|
||||
StrokeLine(BPoint(11,13), BPoint(67,13));
|
||||
StrokeLine(BPoint(67,21));
|
||||
StrokeLine(BPoint(139,21));
|
||||
StrokeLine(BPoint(139,119));
|
||||
StrokeLine(BPoint(11,119));
|
||||
StrokeLine(BPoint(11,13));
|
||||
StrokeRect(BRect(14,24,136,116));
|
||||
SetHighColor(255,203,0);
|
||||
FillRect(BRect(12,14,66,21));
|
||||
SetHighColor(240,240,240);
|
||||
StrokeRect(BRect(12,22,137,117));
|
||||
StrokeLine(BPoint(138,22), BPoint(138,22));
|
||||
StrokeLine(BPoint(12,118), BPoint(12,118));
|
||||
SetHighColor(200,200,200);
|
||||
StrokeRect(BRect(13,23,138,118));
|
||||
SetHighColor(152, 152, 152);
|
||||
StrokeLine(BPoint(11, 13), BPoint(67, 13));
|
||||
StrokeLine(BPoint(67, 21));
|
||||
StrokeLine(BPoint(139, 21));
|
||||
StrokeLine(BPoint(139, 119));
|
||||
StrokeLine(BPoint(11, 119));
|
||||
StrokeLine(BPoint(11, 13));
|
||||
StrokeRect(BRect(14, 24, 136, 116));
|
||||
SetHighColor(255, 203, 0);
|
||||
FillRect(BRect(12, 14, 66, 21));
|
||||
SetHighColor(240, 240, 240);
|
||||
StrokeRect(BRect(12, 22, 137, 117));
|
||||
StrokeLine(BPoint(138, 22), BPoint(138, 22));
|
||||
StrokeLine(BPoint(12, 118), BPoint(12, 118));
|
||||
SetHighColor(200, 200, 200);
|
||||
StrokeRect(BRect(13, 23, 138, 118));
|
||||
}
|
||||
|
||||
SetHighColor(color);
|
||||
|
||||
@@ -73,7 +73,7 @@ class PreView : public BControl {
|
||||
void AttachedToWindow();
|
||||
|
||||
BPoint fOldPoint;
|
||||
float x_ratio,y_ratio;
|
||||
float x_ratio, y_ratio;
|
||||
display_mode mode;
|
||||
|
||||
BCursor fMoveHandCursor;
|
||||
|
||||
@@ -96,14 +96,14 @@ ImageFilePanel::SelectionChanged()
|
||||
|
||||
if (bitmap != NULL) {
|
||||
BRect dest(fImageView->Bounds());
|
||||
if (bitmap->Bounds().Width()>bitmap->Bounds().Height()) {
|
||||
dest.InsetBy(0, (dest.Height()+1 -
|
||||
((bitmap->Bounds().Height()+1) /
|
||||
(bitmap->Bounds().Width()+1) * (dest.Width()+1)))/2);
|
||||
if (bitmap->Bounds().Width() > bitmap->Bounds().Height()) {
|
||||
dest.InsetBy(0, (dest.Height() + 1 -
|
||||
((bitmap->Bounds().Height() + 1) /
|
||||
(bitmap->Bounds().Width() + 1) *(dest.Width() + 1))) / 2);
|
||||
} else {
|
||||
dest.InsetBy((dest.Width()+1 -
|
||||
((bitmap->Bounds().Width()+1) /
|
||||
(bitmap->Bounds().Height()+1) * (dest.Height()+1)))/2, 0);
|
||||
dest.InsetBy((dest.Width() + 1 -
|
||||
((bitmap->Bounds().Width() + 1) /
|
||||
(bitmap->Bounds().Height() + 1) *(dest.Height() + 1))) / 2, 0);
|
||||
}
|
||||
fImageView->SetViewBitmap(bitmap, bitmap->Bounds(), dest,
|
||||
B_FOLLOW_LEFT | B_FOLLOW_TOP, 0);
|
||||
@@ -120,13 +120,13 @@ ImageFilePanel::SelectionChanged()
|
||||
if (nodeInfo.GetType(type) == B_OK) {
|
||||
BMimeType mimeType(type);
|
||||
mimeType.GetShortDescription(type);
|
||||
// if this fails, the MIME type will be displayed
|
||||
// if this fails, the MIME type will be displayed
|
||||
fImageTypeView->SetText(type);
|
||||
} else {
|
||||
BMimeType refType;
|
||||
if (BMimeType::GuessMimeType(&ref, &refType) == B_OK) {
|
||||
refType.GetShortDescription(type);
|
||||
// if this fails, the MIME type will be displayed
|
||||
// if this fails, the MIME type will be displayed
|
||||
fImageTypeView->SetText(type);
|
||||
} else
|
||||
fImageTypeView->SetText("");
|
||||
|
||||
Reference in New Issue
Block a user