Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes some bugs with buttons

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16898 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2006-03-27 19:30:19 +00:00
parent ae89492b27
commit 1e7392d78b
3 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/preferences/backgrounds/BackgroundImage.cpp
View File

@ -210,6 +210,13 @@ BackgroundImage::Add(BackgroundImageInfo *info)
}
void
BackgroundImage::Remove(BackgroundImageInfo *info)
{
fBitmapForWorkspaceList.RemoveItem(info);
}
void
BackgroundImage::RemoveAll()
{

1
src/preferences/backgrounds/BackgroundImage.h
View File

@ -131,6 +131,7 @@ public:
uint32 GetShowingImageSet() { return fShowingImageSet; }
void Add(BackgroundImageInfo *);
void Remove(BackgroundImageInfo *);
void RemoveAll();
private:

68
src/preferences/backgrounds/BackgroundsView.cpp
View File

@ -551,7 +551,7 @@ BackgroundsView::Save()
}
} else {
uint32 workspaceMask = 1;
uint32 workspace = current_workspace();
int32 workspace = current_workspace();
for (; workspace; workspace--)
workspaceMask *= 2;
@ -560,21 +560,28 @@ BackgroundsView::Save()
if (fCurrentInfo->fWorkspace != workspaceMask) {
fCurrentInfo->fWorkspace = fCurrentInfo->fWorkspace
^ workspaceMask;
fCurrentInfo = new BackgroundImage::BackgroundImageInfo(
workspaceMask, fLastImageIndex, mode, offset,
eraseTextWidgetBackground, fCurrentInfo->fImageSet,
fCurrentInfo->fCacheMode);
fCurrent->Add(fCurrentInfo);
if (fLastImageIndex > -1) {
fCurrentInfo = new BackgroundImage::BackgroundImageInfo(
workspaceMask, fLastImageIndex, mode, offset,
eraseTextWidgetBackground, fCurrentInfo->fImageSet,
fCurrentInfo->fCacheMode);
fCurrent->Add(fCurrentInfo);
}
} else {
fCurrentInfo->fEraseTextWidgetBackground =
eraseTextWidgetBackground;
fCurrentInfo->fMode = mode;
if (fCurrentInfo->fMode == BackgroundImage::kAtOffset)
fCurrentInfo->fOffset = offset;
fCurrentInfo->fImageIndex = fLastImageIndex;
if (fLastImageIndex > -1) {
fCurrentInfo->fEraseTextWidgetBackground =
eraseTextWidgetBackground;
fCurrentInfo->fMode = mode;
if (fCurrentInfo->fMode == BackgroundImage::kAtOffset)
fCurrentInfo->fOffset = offset;
fCurrentInfo->fImageIndex = fLastImageIndex;
} else {
fCurrent->Remove(fCurrentInfo);
fCurrentInfo = NULL;
}
}
} else {
} else if (fLastImageIndex > -1) {
fCurrent->RemoveAll();
fCurrentInfo = new BackgroundImage::BackgroundImageInfo(
B_ALL_WORKSPACES, fLastImageIndex, mode, offset,
@ -582,7 +589,7 @@ BackgroundsView::Save()
fCurrentInfo->fCacheMode);
fCurrent->Add(fCurrentInfo);
}
} else {
} else if (fLastImageIndex > -1) {
if (fWorkspaceMenu->FindItem(kMsgCurrentWorkspace)->IsMarked()) {
fCurrentInfo = new BackgroundImage::BackgroundImageInfo(
workspaceMask, fLastImageIndex, mode, offset,
@ -596,9 +603,9 @@ BackgroundsView::Save()
fCurrent->Add(fCurrentInfo);
}
if (fCurrentInfo->fWorkspace == B_ALL_WORKSPACES) {
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);
@ -814,7 +821,7 @@ BackgroundsView::UpdatePreview()
if (fYPlacementText->IsEnabled() ^ textEnabled)
fYPlacementText->SetEnabled(textEnabled);
if (textEnabled && fXPlacementText->TextView()->IsSelectable() != textEnabled) {
if (textEnabled && (strcmp(fXPlacementText->Text(), "") == 0)) {
fXPlacementText->SetText("0");
fYPlacementText->SetText("0");
}
@ -892,29 +899,32 @@ BackgroundsView::UpdateButtons()
hasChanged = true;
} else if (fCurrentInfo) {
if ((fIconLabelBackground->Value() == B_CONTROL_ON) ^
fCurrentInfo->fEraseTextWidgetBackground)
fCurrentInfo->fEraseTextWidgetBackground) {
hasChanged = true;
else if (FindPlacementMode() != fCurrentInfo->fMode)
} else if (FindPlacementMode() != fCurrentInfo->fMode) {
hasChanged = true;
else if (fCurrentInfo->fImageIndex !=
((BGImageMenuItem*)fImageMenu->FindMarked())->ImageIndex())
hasChanged = true;
else if (fCurrent->IsDesktop()
} else if (fCurrentInfo->fImageIndex !=
((BGImageMenuItem*)fImageMenu->FindMarked())->ImageIndex()) {
hasChanged = true;
} else if (fCurrent->IsDesktop()
&& ((fCurrentInfo->fWorkspace != B_ALL_WORKSPACES)
^ (fWorkspaceMenu->FindItem(kMsgCurrentWorkspace)->IsMarked())))
^ (fWorkspaceMenu->FindItem(kMsgCurrentWorkspace)->IsMarked()))) {
hasChanged = true;
else if (fCurrentInfo->fMode == BackgroundImage::kAtOffset) {
} else if (fCurrentInfo->fMode == BackgroundImage::kAtOffset) {
BString oldString, newString;
oldString << (int)fCurrentInfo->fOffset.x;
if (oldString != BString(fXPlacementText->Text()))
if (oldString != BString(fXPlacementText->Text())) {
hasChanged = true;
}
oldString = "";
oldString << (int)fCurrentInfo->fOffset.y;
if (oldString != BString(fYPlacementText->Text()))
if (oldString != BString(fYPlacementText->Text())) {
hasChanged = true;
}
}
} else if (fImageMenu->IndexOf(fImageMenu->FindMarked()) > 0)
} else if (fImageMenu->IndexOf(fImageMenu->FindMarked()) > 0) {
hasChanged = true;
}
fApply->SetEnabled(hasChanged);
fRevert->SetEnabled(hasChanged);