Author: kirilla Date: 2011-03-24 23:43:48 +0100 (Thu, 24 Mar 2011) New Revision: 41098 Changeset: https://dev.haiku-os.org/changeset/41098 Modified: haiku/trunk/src/apps/deskbar/BarMenuBar.cpp haiku/trunk/src/apps/deskbar/ExpandoMenuBar.cpp haiku/trunk/src/apps/deskbar/StatusView.cpp haiku/trunk/src/apps/deskbar/icon-freelogo.rdef haiku/trunk/src/apps/deskbar/icons_logo.h Log: A better for the leaf logo bitmap. Modified: haiku/trunk/src/apps/deskbar/BarMenuBar.cpp =================================================================== --- haiku/trunk/src/apps/deskbar/BarMenuBar.cpp 2011-03-24 22:30:11 UTC (rev 41097) +++ haiku/trunk/src/apps/deskbar/BarMenuBar.cpp 2011-03-24 22:43:48 UTC (rev 41098) @@ -62,7 +62,7 @@ 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); } Modified: haiku/trunk/src/apps/deskbar/ExpandoMenuBar.cpp =================================================================== --- haiku/trunk/src/apps/deskbar/ExpandoMenuBar.cpp 2011-03-24 22:30:11 UTC (rev 41097) +++ haiku/trunk/src/apps/deskbar/ExpandoMenuBar.cpp 2011-03-24 22:43:48 UTC (rev 41098) @@ -116,7 +116,7 @@ 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(), Modified: haiku/trunk/src/apps/deskbar/StatusView.cpp =================================================================== --- haiku/trunk/src/apps/deskbar/StatusView.cpp 2011-03-24 22:30:11 UTC (rev 41097) +++ haiku/trunk/src/apps/deskbar/StatusView.cpp 2011-03-24 22:43:48 UTC (rev 41098) @@ -138,7 +138,7 @@ { // 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)); Modified: haiku/trunk/src/apps/deskbar/icon-freelogo.rdef =================================================================== --- haiku/trunk/src/apps/deskbar/icon-freelogo.rdef 2011-03-24 22:30:11 UTC (rev 41097) +++ haiku/trunk/src/apps/deskbar/icon-freelogo.rdef 2011-03-24 22:43:48 UTC (rev 41098) @@ -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, Modified: haiku/trunk/src/apps/deskbar/icons_logo.h =================================================================== --- haiku/trunk/src/apps/deskbar/icons_logo.h 2011-03-24 22:30:11 UTC (rev 41097) +++ haiku/trunk/src/apps/deskbar/icons_logo.h 2011-03-24 22:43:48 UTC (rev 41098) @@ -1,3 +1,3 @@ enum { - R_BeLogoIcon = 14 + R_LeafLogoBitmap = 14 };