ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-03-23 04:25:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

window_layouter: calculate weighted dimension in double

Browse Source 
The change prevents integer overflows with reasonable large values.

Thanks Peter for reporting.
This commit is contained in:
Christian Helmuth 2024-04-29 16:08:56 +02:00
parent fc27469b97
commit 3a0ded3bdd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
repos/gems/src/app/window_layouter/target_list.h
View File

@ -76,7 +76,7 @@ class Window_layouter::Target_list
}
/* amount of pixels we can use for weighed columns */
unsigned const weigthed_avail = avail_px - preserved_pixels;
unsigned const weighted_avail = avail_px - preserved_pixels;
/*
* Calculate positions
@ -91,9 +91,9 @@ class Window_layouter::Target_list
if (px)
return px;
unsigned const weight = weight_attr_value(child);
double const weight = weight_attr_value(child);
if (weight && total_weight)
return (((weight << 16)*weigthed_avail)/total_weight) >> 16;
return (unsigned) (weight/total_weight*weighted_avail);
return 0U;
};
@ -103,12 +103,12 @@ class Window_layouter::Target_list
if (weighted)
count_weighted++;
/* true if target is the last weigthed column or row */
/* true if target is the last weighted column or row */
bool const last_weighted = weighted
&& (count_weighted == num_weighted);
unsigned const px_size = last_weighted
? (weigthed_avail - used_weighted)
? (weighted_avail - used_weighted)
: calc_px_size();
if (weighted)