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

Interface Kit: Add casts to int32 following previous commit.

Browse Source
This commit is contained in:
Augustin Cavalier
2023-07-15 09:29:08 -04:00
parent da70563f7f
commit 71bba69f8a
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/LayoutUtils.cpp
+2 -2
View File
@@ -43,8 +43,8 @@
int32 int32
BLayoutUtils::AddSizesInt32(int32 a, int32 b) BLayoutUtils::AddSizesInt32(int32 a, int32 b)
{ {
if (a >= B_SIZE_UNLIMITED - b) if (a >= (int32)B_SIZE_UNLIMITED - b)
return B_SIZE_UNLIMITED; return (int32)B_SIZE_UNLIMITED;
return a + b; return a + b;
} }
src/kits/interface/layouter/ComplexLayouter.cpp
+1 -1
View File
@@ -168,7 +168,7 @@ ComplexLayouter::ComplexLayouter(int32 elementCount, float spacing)
fSums(new(nothrow) SumItem[elementCount + 1]), fSums(new(nothrow) SumItem[elementCount + 1]),
fSumBackups(new(nothrow) SumItemBackup[elementCount + 1]), fSumBackups(new(nothrow) SumItemBackup[elementCount + 1]),
fOptimizer(new(nothrow) LayoutOptimizer(elementCount)), fOptimizer(new(nothrow) LayoutOptimizer(elementCount)),
fUnlimited(B_SIZE_UNLIMITED / (elementCount == 0 ? 1 : elementCount)), fUnlimited((int32)B_SIZE_UNLIMITED / (elementCount == 0 ? 1 : elementCount)),
fMinMaxValid(false), fMinMaxValid(false),
fOptimizerConstraintsAdded(false) fOptimizerConstraintsAdded(false)
{ {
src/kits/interface/layouter/SimpleLayouter.cpp
+4 -4
View File
@@ -44,7 +44,7 @@ public:
ElementInfo() ElementInfo()
: index(0), : index(0),
min(0), min(0),
max(B_SIZE_UNLIMITED), max((int32)B_SIZE_UNLIMITED),
preferred(0), preferred(0),
weight(1), weight(1),
tempWeight(0) tempWeight(0)
@@ -54,7 +54,7 @@ public:
ElementInfo(int index) ElementInfo(int index)
: index(index), : index(index),
min(0), min(0),
max(B_SIZE_UNLIMITED), max((int32)B_SIZE_UNLIMITED),
preferred(0), preferred(0),
weight(1), weight(1),
tempWeight(0) tempWeight(0)
@@ -117,7 +117,7 @@ SimpleLayouter::SimpleLayouter(int32 elementCount, float spacing)
: fElementCount(elementCount), : fElementCount(elementCount),
fSpacing((int32)spacing), fSpacing((int32)spacing),
fMin(0), fMin(0),
fMax(B_SIZE_UNLIMITED), fMax((int32)B_SIZE_UNLIMITED),
fPreferred(0), fPreferred(0),
fMinMaxValid(false), fMinMaxValid(false),
fLayoutInfo(NULL) fLayoutInfo(NULL)
@@ -331,7 +331,7 @@ SimpleLayouter::_ValidateMinMax()
if (fElementCount == 0) { if (fElementCount == 0) {
fMin = 0; fMin = 0;
fMax = B_SIZE_UNLIMITED; fMax = (int32)B_SIZE_UNLIMITED;
fPreferred = 0; fPreferred = 0;
return; return;
} }