From 9e8a970bd56e3888b93167d1ab60deef85b7a899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= Date: Thu, 24 Mar 2011 22:43:48 +0000 Subject: [PATCH] A better for the leaf logo bitmap. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41098 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/deskbar/BarMenuBar.cpp | 2 +- src/apps/deskbar/ExpandoMenuBar.cpp | 2 +- src/apps/deskbar/StatusView.cpp | 2 +- src/apps/deskbar/icon-freelogo.rdef | 2 +- src/apps/deskbar/icons_logo.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/apps/deskbar/BarMenuBar.cpp b/src/apps/deskbar/BarMenuBar.cpp index 333e06af42..c51f6c99ea 100644 --- a/src/apps/deskbar/BarMenuBar.cpp +++ b/src/apps/deskbar/BarMenuBar.cpp @@ -62,7 +62,7 @@ TBarMenuBar::TBarMenuBar(TBarView* bar, BRect frame, const char* name) TBarWindow::SetBeMenu(beMenu); fBeMenuItem = new TBarMenuTitle(frame.Width(), frame.Height(), - AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_BeLogoIcon), beMenu); + AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_LeafLogoBitmap), beMenu); AddItem(fBeMenuItem); } diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp b/src/apps/deskbar/ExpandoMenuBar.cpp index 1622b67e7d..739f0761bd 100644 --- a/src/apps/deskbar/ExpandoMenuBar.cpp +++ b/src/apps/deskbar/ExpandoMenuBar.cpp @@ -116,7 +116,7 @@ TExpandoMenuBar::AttachedToWindow() TBeMenu* beMenu = new TBeMenu(fBarView); TBarWindow::SetBeMenu(beMenu); const BBitmap* logoBitmap = AppResSet()->FindBitmap(B_MESSAGE_TYPE, - R_BeLogoIcon); + R_LeafLogoBitmap); if (logoBitmap != NULL) fBeMenuWidth = logoBitmap->Bounds().Width() + 16; fBeMenuItem = new TBarMenuTitle(fBeMenuWidth, Frame().Height(), diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp index e1fc0b5223..620e84aeac 100644 --- a/src/apps/deskbar/StatusView.cpp +++ b/src/apps/deskbar/StatusView.cpp @@ -138,7 +138,7 @@ TReplicantTray::TReplicantTray(TBarView* parent, bool vertical) { // init the minimum window width according to the logo. const BBitmap* logoBitmap = AppResSet()->FindBitmap(B_MESSAGE_TYPE, - R_BeLogoIcon); + R_LeafLogoBitmap); if (logoBitmap != NULL) { sMinimumWindowWidth = max_c(sMinimumWindowWidth, 2 * (logoBitmap->Bounds().Width() + 8)); diff --git a/src/apps/deskbar/icon-freelogo.rdef b/src/apps/deskbar/icon-freelogo.rdef index 81883dcd8b..bf3fbf771a 100644 --- a/src/apps/deskbar/icon-freelogo.rdef +++ b/src/apps/deskbar/icon-freelogo.rdef @@ -1,5 +1,5 @@ -resource(14, "kBeLogoBits") archive BBitmap +resource(14, "kLeafLogoBitmap") archive BBitmap { "_frame" = rect { 0.0, 0.0, 62.0, 21.0 }, "_cspace" = 8200, diff --git a/src/apps/deskbar/icons_logo.h b/src/apps/deskbar/icons_logo.h index 5d1bbdb721..b70618875b 100644 --- a/src/apps/deskbar/icons_logo.h +++ b/src/apps/deskbar/icons_logo.h @@ -1,3 +1,3 @@ enum { - R_BeLogoIcon = 14 + R_LeafLogoBitmap = 14 };