parent
457b000e68
commit
12067d8b30
1 changed files with 5 additions and 12 deletions
|
|
@ -104,18 +104,14 @@ impl FloatingLayout {
|
|||
|
||||
if let Some(size) = last_geometry.map(|g| g.size) {
|
||||
win_geo.size = size;
|
||||
}
|
||||
{
|
||||
} else {
|
||||
let (min_size, max_size) = (
|
||||
mapped.min_size().unwrap_or((0, 0).into()),
|
||||
mapped.max_size().unwrap_or((0, 0).into()),
|
||||
);
|
||||
if win_geo.size.w > max_size.w
|
||||
|| win_geo.size.w < min_size.w
|
||||
|| win_geo.size.w > geometry.size.w
|
||||
{
|
||||
if win_geo.size.w > geometry.size.w / 3 * 2 {
|
||||
// try a more reasonable size
|
||||
let mut width = win_geo.size.w;
|
||||
let mut width = geometry.size.w / 3 * 2;
|
||||
if max_size.w != 0 {
|
||||
// don't go larger then the max_size ...
|
||||
width = std::cmp::min(max_size.w, width);
|
||||
|
|
@ -127,12 +123,9 @@ impl FloatingLayout {
|
|||
// but no matter the supported sizes, don't be larger than our non-exclusive-zone
|
||||
win_geo.size.w = std::cmp::min(width, geometry.size.w);
|
||||
}
|
||||
if win_geo.size.h > max_size.h
|
||||
|| win_geo.size.h < min_size.h
|
||||
|| win_geo.size.h > geometry.size.h
|
||||
{
|
||||
if win_geo.size.h > geometry.size.h / 3 * 2 {
|
||||
// try a more reasonable size
|
||||
let mut height = win_geo.size.h;
|
||||
let mut height = geometry.size.h / 3 * 2;
|
||||
if max_size.h != 0 {
|
||||
// don't go larger then the max_size ...
|
||||
height = std::cmp::min(max_size.h, height);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue