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

* Icon label outline is by default true. We take this into account on PoseView creation in Tracker, and when no image is selected in Backgrounds.

Browse Source 
* This flag is still only settable when an image is selected.



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29190 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2009-02-13 21:39:52 +00:00
parent 10047d2e3d
commit 71ed64b71b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/PoseView.cpp
+1 -1
View File
@@ -209,7 +209,7 @@ BPoseView::BPoseView(Model *model, BRect bounds, uint32 viewMode, uint32 resizeM
fRefFilter(NULL), fRefFilter(NULL),
fAutoScrollInc(20), fAutoScrollInc(20),
fAutoScrollState(kAutoScrollOff), fAutoScrollState(kAutoScrollOff),
fWidgetTextOutline(false), fWidgetTextOutline(true),
fSelectionPivotPose(NULL), fSelectionPivotPose(NULL),
fRealPivotPose(NULL), fRealPivotPose(NULL),
fKeyRunner(NULL), fKeyRunner(NULL),
src/preferences/backgrounds/BackgroundsView.cpp
+4 -3
View File
@@ -528,7 +528,7 @@ BackgroundsView::UpdateWithCurrent(void)
if (!fCurrentInfo) { if (!fCurrentInfo) {
fImageMenu->FindItem(kMsgNoImage)->SetMarked(true); fImageMenu->FindItem(kMsgNoImage)->SetMarked(true);
fPlacementMenu->FindItem(kMsgManualPlacement)->SetMarked(true); fPlacementMenu->FindItem(kMsgManualPlacement)->SetMarked(true);
fIconLabelOutline->SetValue(B_CONTROL_OFF); fIconLabelOutline->SetValue(B_CONTROL_ON);
} else { } else {
fIconLabelOutline->SetValue(fCurrentInfo->fTextWidgetLabelOutline fIconLabelOutline->SetValue(fCurrentInfo->fTextWidgetLabelOutline
? B_CONTROL_ON : B_CONTROL_OFF); ? B_CONTROL_ON : B_CONTROL_OFF);
@@ -772,7 +772,6 @@ BackgroundsView::SaveSettings(void)
entry_ref ref; entry_ref ref;
BEntry entry; BEntry entry;
BPath path;
fPanel->GetPanelDirectory(&ref); fPanel->GetPanelDirectory(&ref);
entry.SetTo(&ref); entry.SetTo(&ref);
@@ -829,7 +828,7 @@ BackgroundsView::LoadSettings()
if (index == 0) if (index == 0)
fWorkspaceMenu->AddSeparatorItem(); fWorkspaceMenu->AddSeparatorItem();
BPath path(string.String()); path.SetTo(string.String());
int32 i = AddPath(path); int32 i = AddPath(path);
BString s; BString s;
s << "Folder: " << path.Leaf(); s << "Folder: " << path.Leaf();
@@ -859,6 +858,8 @@ BackgroundsView::UpdatePreview()
fPlacementMenu->SetEnabled(imageEnabled); fPlacementMenu->SetEnabled(imageEnabled);
if (fIconLabelOutline->IsEnabled() ^ imageEnabled) if (fIconLabelOutline->IsEnabled() ^ imageEnabled)
fIconLabelOutline->SetEnabled(imageEnabled); fIconLabelOutline->SetEnabled(imageEnabled);
if (!imageEnabled)
fIconLabelOutline->SetValue(B_CONTROL_ON);
bool textEnabled = (fPlacementMenu->FindItem(kMsgManualPlacement)->IsMarked()) bool textEnabled = (fPlacementMenu->FindItem(kMsgManualPlacement)->IsMarked())
&& imageEnabled; && imageEnabled;
src/preferences/backgrounds/ImageFilePanel.cpp
-1
View File
@@ -121,7 +121,6 @@ ImageFilePanel::SelectionChanged()
fResolutionView->SetText(resolution.String()); fResolutionView->SetText(resolution.String());
delete bitmap; delete bitmap;
BNode node(&ref);
BNodeInfo nodeInfo(&node); BNodeInfo nodeInfo(&node);
char type[B_MIME_TYPE_LENGTH]; char type[B_MIME_TYPE_LENGTH];
if (nodeInfo.GetType(type) == B_OK) { if (nodeInfo.GetType(type) == B_OK) {