[haiku-commits] haiku: hrev43965 - src/apps/deskbar
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 7 Apr 2012 02:02:07 +0200 (CEST)
hrev43965 adds 2 changesets to branch 'master'
old head: 2ce9bab873e024bb515a95faf384df62b88bbb8c
new head: 3ea5972eb53695826f2901be1d9027d5b979f2f9
----------------------------------------------------------------------------
e687445: Revert change to TimeView.cpp regarding
updating the tooltip. I committed it accidentally.
3ea5972: Style fix. Take out 3 sets of unneeded curly braces.
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 12 insertions(+), 7 deletions(-)
src/apps/deskbar/ExpandoMenuBar.cpp | 12 ++++++------
src/apps/deskbar/TimeView.cpp | 7 ++++++-
############################################################################
Commit: e6874452d06bc03c857c41216b73469491245832
URL: http://cgit.haiku-os.org/haiku/commit/?id=e687445
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Apr 6 23:55:35 2012 UTC
Revert change to TimeView.cpp regarding
updating the tooltip. I committed it accidentally.
----------------------------------------------------------------------------
diff --git a/src/apps/deskbar/TimeView.cpp b/src/apps/deskbar/TimeView.cpp
index 96a7936..f6d50bb 100644
--- a/src/apps/deskbar/TimeView.cpp
+++ b/src/apps/deskbar/TimeView.cpp
@@ -332,10 +332,15 @@ TTimeView::Pulse()
Update();
strlcpy(fLastTimeStr, fTimeStr, sizeof(fLastTimeStr));
- strlcpy(fLastDateStr, fDateStr, sizeof(fLastDateStr));
fNeedToUpdate = true;
}
+ // Update the tooltip if the date has changed
+ if (strcmp(fDateStr, fLastDateStr) != 0) {
+ strlcpy(fLastDateStr, fDateStr, sizeof(fLastDateStr));
+ SetToolTip(fDateStr);
+ }
+
if (fNeedToUpdate) {
fSeconds = ct->tm_sec;
fMinute = ct->tm_min;
############################################################################
Revision: hrev43965
Commit: 3ea5972eb53695826f2901be1d9027d5b979f2f9
URL: http://cgit.haiku-os.org/haiku/commit/?id=3ea5972
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Fri Apr 6 23:58:59 2012 UTC
Style fix. Take out 3 sets of unneeded curly braces.
----------------------------------------------------------------------------
diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp
b/src/apps/deskbar/ExpandoMenuBar.cpp
index 5a6cba8..244addd 100644
--- a/src/apps/deskbar/ExpandoMenuBar.cpp
+++ b/src/apps/deskbar/ExpandoMenuBar.cpp
@@ -121,9 +121,9 @@ TExpandoMenuBar::AttachedToWindow()
desk_settings* settings = static_cast<TBarApp*>(be_app)->Settings();
float itemWidth = -0.1f;
- if (fVertical) {
+ if (fVertical)
itemWidth = Frame().Width();
- } else {
+ else {
itemWidth = iconSize;
if (fDrawLabel)
itemWidth += sMinimumWindowWidth - kMinimumIconSize;
@@ -523,9 +523,9 @@ TExpandoMenuBar::AddTeam(BList* team, BBitmap* icon, char*
name,
int32 iconSize = static_cast<TBarApp*>(be_app)->IconSize();
float itemWidth = -1.0f;
- if (fVertical) {
+ if (fVertical)
itemWidth = fBarView->Bounds().Width();
- } else {
+ else {
itemWidth = iconSize;
if (fDrawLabel)
itemWidth += sMinimumWindowWidth - kMinimumIconSize;
@@ -537,9 +537,9 @@ TExpandoMenuBar::AddTeam(BList* team, BBitmap* icon, char*
name,
TTeamMenuItem* item = new TTeamMenuItem(team, icon, name, signature,
itemWidth, itemHeight, fDrawLabel, fVertical);
- if (settings->trackerAlwaysFirst && !strcmp(signature,
kTrackerSignature)) {
+ if (settings->trackerAlwaysFirst && !strcmp(signature,
kTrackerSignature))
AddItem(item, fFirstApp);
- } else if (settings->sortRunningApps) {
+ else if (settings->sortRunningApps) {
TTeamMenuItem* teamItem
= dynamic_cast<TTeamMenuItem*>(ItemAt(fFirstApp));
int32 firstApp = fFirstApp;
Other related posts:
- » [haiku-commits] haiku: hrev43965 - src/apps/deskbar - jscipione
