hrev51367 adds 3 changesets to branch 'master'
old head: 2c1c78ae26e65b3ca5b6970be7b34007d8e2d705
new head: dd645828666c3c2e870efd0144abe0352c08837a
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=dd645828666c+%5E2c1c78ae26e6
----------------------------------------------------------------------------
b27717747714: ControlLook: remove some bogus clipping
ConstrainClippingRegion was used in BControlLook to limit drawing to
inside the update rect. There are two problems with that:
- It would ignore any other clipping set by the application, as calls to
ConstrainClippingRegion are not cumulative,
- ConstrainClippingRegion ignores transforms on the view, so on a
transformed view, we would not draw anything in most cases.
If constrained clipping is needed here, it should be achieved using
ClipToPicture instead.
b8d9fcbeb308: Revert "ControlLook: remove some bogus clipping"
This reverts commit b277177477148c83d79ba7f0b4737709f023f068.
dd645828666c: HaikuwebKit 1.6.2.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 2 deletions(-)
build/jam/repositories/HaikuPorts/x86_gcc2 | 4 ++--
############################################################################
Commit: b277177477148c83d79ba7f0b4737709f023f068
URL: http://cgit.haiku-os.org/haiku/commit/?id=b27717747714
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Wed Aug 16 15:44:45 2017 UTC
ControlLook: remove some bogus clipping
ConstrainClippingRegion was used in BControlLook to limit drawing to
inside the update rect. There are two problems with that:
- It would ignore any other clipping set by the application, as calls to
ConstrainClippingRegion are not cumulative,
- ConstrainClippingRegion ignores transforms on the view, so on a
transformed view, we would not draw anything in most cases.
If constrained clipping is needed here, it should be achieved using
ClipToPicture instead.
----------------------------------------------------------------------------
diff --git a/src/kits/interface/ControlLook.cpp
b/src/kits/interface/ControlLook.cpp
index fbaadad..a7314f9 100644
--- a/src/kits/interface/ControlLook.cpp
+++ b/src/kits/interface/ControlLook.cpp
@@ -2518,13 +2518,6 @@ BControlLook::_DrawButtonBackground(BView* view, BRect&
rect,
if (!rect.IsValid() || !rect.Intersects(updateRect))
return;
- // save the clipping constraints of the view
- view->PushState();
-
- // set clipping constraints to updateRect
- BRegion clipping(updateRect);
- view->ConstrainClippingRegion(&clipping);
-
// If the button is flat and neither activated nor otherwise highlighted
// (mouse hovering or focussed), draw it flat.
if ((flags & B_FLAT) != 0
@@ -2538,9 +2531,6 @@ BControlLook::_DrawButtonBackground(BView* view, BRect&
rect,
leftTopRadius, rightTopRadius, leftBottomRadius,
rightBottomRadius,
base, popupIndicator, flags, borders, orientation);
}
-
- // restore the clipping constraints of the view
- view->PopState();
}
############################################################################
Commit: b8d9fcbeb308c63b9439fd92420ab05d24384167
URL: http://cgit.haiku-os.org/haiku/commit/?id=b8d9fcbeb308
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Wed Aug 16 15:48:58 2017 UTC
Revert "ControlLook: remove some bogus clipping"
This reverts commit b277177477148c83d79ba7f0b4737709f023f068.
----------------------------------------------------------------------------
diff --git a/src/kits/interface/ControlLook.cpp
b/src/kits/interface/ControlLook.cpp
index a7314f9..fbaadad 100644
--- a/src/kits/interface/ControlLook.cpp
+++ b/src/kits/interface/ControlLook.cpp
@@ -2518,6 +2518,13 @@ BControlLook::_DrawButtonBackground(BView* view, BRect&
rect,
if (!rect.IsValid() || !rect.Intersects(updateRect))
return;
+ // save the clipping constraints of the view
+ view->PushState();
+
+ // set clipping constraints to updateRect
+ BRegion clipping(updateRect);
+ view->ConstrainClippingRegion(&clipping);
+
// If the button is flat and neither activated nor otherwise highlighted
// (mouse hovering or focussed), draw it flat.
if ((flags & B_FLAT) != 0
@@ -2531,6 +2538,9 @@ BControlLook::_DrawButtonBackground(BView* view, BRect&
rect,
leftTopRadius, rightTopRadius, leftBottomRadius,
rightBottomRadius,
base, popupIndicator, flags, borders, orientation);
}
+
+ // restore the clipping constraints of the view
+ view->PopState();
}
############################################################################
Revision: hrev51367
Commit: dd645828666c3c2e870efd0144abe0352c08837a
URL: http://cgit.haiku-os.org/haiku/commit/?id=dd645828666c
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Sat Aug 19 09:20:32 2017 UTC
HaikuwebKit 1.6.2.
----------------------------------------------------------------------------
diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2
b/build/jam/repositories/HaikuPorts/x86_gcc2
index 9ea9051..f5178ba 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -775,8 +775,8 @@ RemotePackageRepository HaikuPorts
graphite2_x86_devel-1.3.8-1
guilib_x86-1.2.1-1
guilib_x86_devel-1.2.1-1
- haikuwebkit_x86-1.6.1-1
- haikuwebkit_x86_devel-1.6.1-1
+ haikuwebkit_x86-1.6.2-1
+ haikuwebkit_x86_devel-1.6.2-1
handbrake_x86-0.10.5-1
harfbuzz_x86-1.3.0-1
harfbuzz_x86_devel-1.3.0-1
