diff options
| author | Fredrik Modéen <fredrik@modeen.se> | 2012-07-25 00:48:24 +0000 |
|---|---|---|
| committer | Fredrik Modéen <fredrik@modeen.se> | 2012-07-25 00:49:30 +0000 |
| commit | e2c343a22a731d4ec7f6ede64adb36dbf275021e (patch) | |
| tree | 42d5ef322aebe176645f3fc778f1a108add10632 | |
| parent | aacf2782d8022d7178125948daac67533ef3e473 (diff) | |
* Checking and setting a default value if both icon and text are false.
| -rw-r--r-- | src/apps/powerstatus/PowerStatusView.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/apps/powerstatus/PowerStatusView.cpp b/src/apps/powerstatus/PowerStatusView.cpp index f0362e8b3b..647dae5399 100644 --- a/src/apps/powerstatus/PowerStatusView.cpp +++ b/src/apps/powerstatus/PowerStatusView.cpp @@ -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. * * Authors: @@ -419,6 +419,10 @@ PowerStatusView::FromMessage(const BMessage* archive) fShowStatusIcon = value; if (archive->FindBool("show time", &value) == B_OK) fShowTime = value; + + //Incase we have a bad saving and none are showed.. + if (!fShowLabel && !fShowStatusIcon) + fShowLabel = true; int32 intValue; if (archive->FindInt32("battery id", &intValue) == B_OK) @@ -539,7 +543,11 @@ PowerStatusReplicant::MessageReceived(BMessage *message) { switch (message->what) { case kMsgToggleLabel: - fShowLabel = !fShowLabel; + if (fShowStatusIcon) + fShowLabel = !fShowLabel; + else + fShowLabel = true; + Update(true); break; @@ -549,7 +557,11 @@ PowerStatusReplicant::MessageReceived(BMessage *message) break; case kMsgToggleStatusIcon: - fShowStatusIcon = !fShowStatusIcon; + if (fShowLabel) + fShowStatusIcon = !fShowStatusIcon; + else + fShowStatusIcon = true; + Update(true); break; |