On Mon, 7 Apr 2025 18:49:51 GMT, Andy Goryachev <ango...@openjdk.org> wrote:

>> Michael Strauß has updated the pull request with a new target base due to a 
>> merge or a rebase. The pull request now contains 77 commits:
>> 
>>  - doc update
>>  - Merge branch 'master' into feature/extended-window
>>    
>>    # Conflicts:
>>    # tests/manual/monkey/src/com/oracle/tools/fx/monkey/MainWindow.java
>>    # 
>> tests/manual/monkey/src/com/oracle/tools/fx/monkey/tools/ModalWindow.java
>>  - documentation
>>  - documentation
>>  - tweak header button scaling at 100%
>>  - enable preview features in tests
>>  - add preview feature
>>  - add preview feature
>>  - Merge branch 'master' into feature/extended-window
>>  - tweak header button glyph scaling
>>  - ... and 67 more: https://git.openjdk.org/jfx/compare/f31d00d8...88e50163
>
> modules/javafx.graphics/src/main/java/javafx/scene/layout/HeaderBar.java line 
> 854:
> 
>> 852:             return minimum
>> 853:                 ? computeChildMinAreaHeight(child, -1, margin, width, 
>> false)
>> 854:                 : computeChildPrefAreaHeight(child, -1, margin, width, 
>> false);
> 
> this change is not doc-related - was it somehow omitted from before?

This was a leftover from a merge conflict that was caused by recent changes to 
the `Region.computeChildMinAreaHeight` and `Region.computeChildPrefAreaHeight` 
methods. The commit message is just a bit sloppy.

-------------

PR Review Comment: https://git.openjdk.org/jfx/pull/1605#discussion_r2031833781

Reply via email to