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

Add casts to appease GCC2 following recent changes.

Browse Source
This commit is contained in:
Augustin Cavalier
2022-08-26 00:42:32 -04:00
parent 4e2c07efa4
commit 1be8560567
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/ExpandoMenuBar.cpp
+3 -3
View File
@@ -839,7 +839,7 @@ float
TExpandoMenuBar::MinHorizontalItemWidth() TExpandoMenuBar::MinHorizontalItemWidth()
{ {
const int32 iconSize = static_cast<TBarApp*>(be_app)->IconSize(); const int32 iconSize = static_cast<TBarApp*>(be_app)->IconSize();
const int32 iconPadding = be_control_look->ComposeSpacing(kIconPadding); const float iconPadding = be_control_look->ComposeSpacing(kIconPadding);
float iconOnlyWidth = iconSize + iconPadding; float iconOnlyWidth = iconSize + iconPadding;
return static_cast<TBarApp*>(be_app)->Settings()->hideLabels return static_cast<TBarApp*>(be_app)->Settings()->hideLabels
@@ -852,8 +852,8 @@ TExpandoMenuBar::MinHorizontalItemWidth()
float float
TExpandoMenuBar::MaxHorizontalItemWidth() TExpandoMenuBar::MaxHorizontalItemWidth()
{ {
int32 iconSize = static_cast<TBarApp*>(be_app)->IconSize(); const int32 iconSize = static_cast<TBarApp*>(be_app)->IconSize();
const int32 iconPadding = be_control_look->ComposeSpacing(kIconPadding); const float iconPadding = be_control_look->ComposeSpacing(kIconPadding);
float iconOnlyWidth = iconSize + iconPadding; float iconOnlyWidth = iconSize + iconPadding;
// hide labels // hide labels
src/apps/deskbar/StatusView.cpp
+3 -3
View File
@@ -193,7 +193,7 @@ TReplicantTray::AttachedToWindow()
AddChild(fTime); AddChild(fTime);
const int32 trayPadding = ceilf(be_control_look->ComposeSpacing(kTrayPadding) / 2); const float trayPadding = ceilf(be_control_look->ComposeSpacing(kTrayPadding) / 2);
fTime->MoveTo(Bounds().right - fTime->Bounds().Width() - trayPadding, 2); fTime->MoveTo(Bounds().right - fTime->Bounds().Width() - trayPadding, 2);
// will be moved into place later // will be moved into place later
@@ -232,7 +232,7 @@ TReplicantTray::GetPreferredSize(float* preferredWidth, float* preferredHeight)
{ {
float width = 0; float width = 0;
float height = fMinTrayHeight; float height = fMinTrayHeight;
const int32 trayPadding = ceilf(be_control_look->ComposeSpacing(kTrayPadding) / 2); const float trayPadding = ceilf(be_control_look->ComposeSpacing(kTrayPadding) / 2);
if (fBarView->Vertical()) { if (fBarView->Vertical()) {
width = static_cast<TBarApp*>(be_app)->Settings()->width width = static_cast<TBarApp*>(be_app)->Settings()->width
@@ -1175,7 +1175,7 @@ TReplicantTray::AcceptAddon(BRect replicantFrame, BMessage* message)
BPoint BPoint
TReplicantTray::LocationForReplicant(int32 index, float replicantWidth) TReplicantTray::LocationForReplicant(int32 index, float replicantWidth)
{ {
const int32 trayPadding = ceilf(be_control_look->ComposeSpacing(kTrayPadding) / 2); const float trayPadding = ceilf(be_control_look->ComposeSpacing(kTrayPadding) / 2);
BPoint loc(trayPadding, 0); BPoint loc(trayPadding, 0);
if (fBarView->Vertical() || fBarView->MiniState()) { if (fBarView->Vertical() || fBarView->MiniState()) {
if (fBarView->Vertical() && !fBarView->Left()) if (fBarView->Vertical() && !fBarView->Left())
src/kits/interface/ControlLook.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ BControlLook::ComposeIconSize(int32 size)
if (scale < 1.0f) if (scale < 1.0f)
scale = 1.0f; scale = 1.0f;
const int32 scaled = size * scale; const int32 scaled = (int32)(size * scale);
return BSize(scaled - 1, scaled - 1); return BSize(scaled - 1, scaled - 1);
} }
src/kits/shared/IconButton.cpp
+2 -2
View File
@@ -310,8 +310,8 @@ BIconButton::SetIcon(int32 resourceID)
const void* data = resources.LoadResource(B_VECTOR_ICON_TYPE, resourceID, const void* data = resources.LoadResource(B_VECTOR_ICON_TYPE, resourceID,
&size); &size);
if (data != NULL) { if (data != NULL) {
BBitmap bitmap(BRect(BPoint(0, 0), be_control_look->ComposeIconSize(32)), const BRect bitmapRect(BPoint(0, 0), be_control_look->ComposeIconSize(32));
B_BITMAP_NO_SERVER_LINK, B_RGBA32); BBitmap bitmap(bitmapRect, B_BITMAP_NO_SERVER_LINK, B_RGBA32);
status = bitmap.InitCheck(); status = bitmap.InitCheck();
if (status != B_OK) if (status != B_OK)
return status; return status;
src/kits/tracker/IconMenuItem.cpp
+1 -1
View File
@@ -421,7 +421,7 @@ IconMenuItem::GetContentSize(float* width, float* height)
int32 iconHeight = fWhich; int32 iconHeight = fWhich;
if (fDeviceIcon != NULL) if (fDeviceIcon != NULL)
iconHeight = fDeviceIcon->Bounds().Height() + 1; iconHeight = fDeviceIcon->Bounds().IntegerHeight() + 1;
fHeightDelta = iconHeight - *height; fHeightDelta = iconHeight - *height;
if (*height < iconHeight) if (*height < iconHeight)