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

Fixing #6913.

Browse Source 
* Checking and setting a default value if both icon and text are false.
This commit is contained in:
Fredrik Modéen
2012-07-25 00:49:30 +00:00
parent aacf2782d8
commit e2c343a22a
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/powerstatus/PowerStatusView.cpp
+15 -3
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2006-2010, Haiku, Inc. All Rights Reserved. * Copyright 2006-2012, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -419,6 +419,10 @@ PowerStatusView::FromMessage(const BMessage* archive)
fShowStatusIcon = value; fShowStatusIcon = value;
if (archive->FindBool("show time", &value) == B_OK) if (archive->FindBool("show time", &value) == B_OK)
fShowTime = value; fShowTime = value;
//Incase we have a bad saving and none are showed..
if (!fShowLabel && !fShowStatusIcon)
fShowLabel = true;
int32 intValue; int32 intValue;
if (archive->FindInt32("battery id", &intValue) == B_OK) if (archive->FindInt32("battery id", &intValue) == B_OK)
@@ -539,7 +543,11 @@ PowerStatusReplicant::MessageReceived(BMessage *message)
{ {
switch (message->what) { switch (message->what) {
case kMsgToggleLabel: case kMsgToggleLabel:
fShowLabel = !fShowLabel; if (fShowStatusIcon)
fShowLabel = !fShowLabel;
else
fShowLabel = true;
Update(true); Update(true);
break; break;
@@ -549,7 +557,11 @@ PowerStatusReplicant::MessageReceived(BMessage *message)
break; break;
case kMsgToggleStatusIcon: case kMsgToggleStatusIcon:
fShowStatusIcon = !fShowStatusIcon; if (fShowLabel)
fShowStatusIcon = !fShowStatusIcon;
else
fShowStatusIcon = true;
Update(true); Update(true);
break; break;