AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Matthiasc/for master

See merge request GNOME/gtk!1761
This commit is contained in:
Matthias Clasen 2020-04-25 19:26:36 +00:00
commit ae7fd6f129
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtkfixedlayout.c
View File

@ -251,12 +251,25 @@ gtk_fixed_layout_measure (GtkLayoutManager *layout_manager,
&child_min_opp, &child_nat_opp,
NULL, NULL);
gsk_transform_transform_bounds (child_info->transform,
&GRAPHENE_RECT_INIT (0.f, 0.f, child_min, child_min_opp),
&min_rect);
gsk_transform_transform_bounds (child_info->transform,
&GRAPHENE_RECT_INIT (0.f, 0.f, child_nat, child_nat_opp),
&nat_rect);
min_rect.origin.x = min_rect.origin.y = 0;
nat_rect.origin.x = nat_rect.origin.y = 0;
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
min_rect.size.width = child_min;
min_rect.size.height = child_min_opp;
nat_rect.size.width = child_nat;
nat_rect.size.height = child_nat_opp;
}
else
{
min_rect.size.width = child_min_opp;
min_rect.size.height = child_min;
nat_rect.size.width = child_nat_opp;
nat_rect.size.height = child_nat;
}
gsk_transform_transform_bounds (child_info->transform, &min_rect, &min_rect);
gsk_transform_transform_bounds (child_info->transform, &nat_rect, &nat_rect);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{

20
testsuite/reftests/background-image-multiple.ref.ui
View File

@ -41,10 +41,7 @@
<property name="width_request">144</property>
<property name="height_request">70</property>
<layout>
<!-- FIXME: these don't exist anymore
<property name="x">0</property>
<property name="y">0</property>
-->
<property name="transform">translate(0,0)</property>
</layout>
</object>
</child>
@ -55,10 +52,7 @@
<property name="width_request">120</property>
<property name="height_request">46</property>
<layout>
<!-- FIXME: these don't exist anymore
<property name="x">12</property>
<property name="y">12</property>
-->
<property name="transform">translate(12,12)</property>
</layout>
</object>
</child>
@ -75,10 +69,7 @@
<property name="width_request">144</property>
<property name="height_request">70</property>
<layout>
<!-- FIXME: these don't exist anymore
<property name="x">0</property>
<property name="y">0</property>
-->
<property name="transform">translate(0,0)</property>
</layout>
</object>
</child>
@ -89,10 +80,7 @@
<property name="width_request">120</property>
<property name="height_request">46</property>
<layout>
<!-- FIXME: these don't exist anymore
<property name="x">12</property>
<property name="y">12</property>
-->
<property name="transform">translate(12,12)</property>
</layout>
</object>
</child>

1
testsuite/reftests/meson.build
View File

@ -422,7 +422,6 @@ testdata = [
# These need to be fixed but the issue hasn't been tracked down.
xfails = [
'background-image-multiple.ui',
'background-origin.ui',
# see above
#'sizegroups-evolution-identity-page.ui',