fix shadow drawing in overlap-container

commit_hash:32a564412833f5cd6d8d186a6823c494ea2975d8
This commit is contained in:
avmushtukov
2024-10-10 18:10:05 +03:00
parent 62da365119
commit b29d0cdfbf
17 changed files with 110 additions and 9 deletions
+14
View File
@@ -2288,6 +2288,7 @@
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API24_HDPI_540x1200/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png",
@@ -3203,6 +3204,7 @@
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png",
@@ -4118,6 +4120,7 @@
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API26_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png",
@@ -5033,6 +5036,7 @@
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png",
@@ -5948,6 +5952,7 @@
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API28_XHDPI_720x1600/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png",
@@ -6863,6 +6868,7 @@
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png",
@@ -7778,6 +7784,7 @@
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API30_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png",
@@ -8693,6 +8700,7 @@
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewPixelCopy/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png",
@@ -9608,6 +9616,7 @@
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-margins.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/match-parent-with-padding.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/no-scale-background.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-children-shadows.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-alignment.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-container-child-wrap-containers.png",
"client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png":"divkit/public/client/android/divkit-demo-app/src/screenshotTest/screenshots/API32_XXHDPI_1080x2400/viewRender/com.yandex.div.Div2ScreenshotTest/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.png",
@@ -12553,6 +12562,8 @@
"client/ios/Tests/reference_snapshots/div-container/match-parent-with-padding_414@3x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/match-parent-with-padding_414@3x.png",
"client/ios/Tests/reference_snapshots/div-container/no-scale-background_375@2x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/no-scale-background_375@2x.png",
"client/ios/Tests/reference_snapshots/div-container/no-scale-background_414@3x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/no-scale-background_414@3x.png",
"client/ios/Tests/reference_snapshots/div-container/overlap-children-shadows_375@2x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/overlap-children-shadows_375@2x.png",
"client/ios/Tests/reference_snapshots/div-container/overlap-children-shadows_414@3x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/overlap-children-shadows_414@3x.png",
"client/ios/Tests/reference_snapshots/div-container/overlap-container-alignment_375@2x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/overlap-container-alignment_375@2x.png",
"client/ios/Tests/reference_snapshots/div-container/overlap-container-alignment_414@3x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/overlap-container-alignment_414@3x.png",
"client/ios/Tests/reference_snapshots/div-container/overlap-container-child-wrap-containers_375@2x.png":"divkit/public/client/ios/Tests/reference_snapshots/div-container/overlap-container-child-wrap-containers_375@2x.png",
@@ -14511,6 +14522,8 @@
"client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/match-parent-with-padding/firefoxMobile/match-parent-with-padding.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/match-parent-with-padding/firefoxMobile/match-parent-with-padding.png",
"client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/no-scale-background/chromeMobile/no-scale-background.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/no-scale-background/chromeMobile/no-scale-background.png",
"client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/no-scale-background/firefoxMobile/no-scale-background.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/no-scale-background/firefoxMobile/no-scale-background.png",
"client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/overlap-children-shadows/chromeMobile/overlap-children-shadows.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/overlap-children-shadows/chromeMobile/overlap-children-shadows.png",
"client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/overlap-children-shadows/firefoxMobile/overlap-children-shadows.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/overlap-children-shadows/firefoxMobile/overlap-children-shadows.png",
"client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/overlap-container-alignment/chromeMobile/overlap-container-alignment.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/overlap-container-alignment/chromeMobile/overlap-container-alignment.png",
"client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/overlap-container-alignment/firefoxMobile/overlap-container-alignment.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/overlap-container-alignment/firefoxMobile/overlap-container-alignment.png",
"client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/overlap-container-child-wrap-containers/chromeMobile/overlap-container-child-wrap-containers.png":"divkit/public/client/web/divkit/tests/hermione/screens/crossplatform/components/div-container/overlap-container-child-wrap-containers/chromeMobile/overlap-container-child-wrap-containers.png",
@@ -17851,6 +17864,7 @@
"test_data/snapshot_test_data/div-container/match-parent-with-margins.json":"divkit/public/test_data/snapshot_test_data/div-container/match-parent-with-margins.json",
"test_data/snapshot_test_data/div-container/match-parent-with-padding.json":"divkit/public/test_data/snapshot_test_data/div-container/match-parent-with-padding.json",
"test_data/snapshot_test_data/div-container/no-scale-background.json":"divkit/public/test_data/snapshot_test_data/div-container/no-scale-background.json",
"test_data/snapshot_test_data/div-container/overlap-children-shadows.json":"divkit/public/test_data/snapshot_test_data/div-container/overlap-children-shadows.json",
"test_data/snapshot_test_data/div-container/overlap-container-alignment.json":"divkit/public/test_data/snapshot_test_data/div-container/overlap-container-alignment.json",
"test_data/snapshot_test_data/div-container/overlap-container-child-wrap-containers.json":"divkit/public/test_data/snapshot_test_data/div-container/overlap-container-child-wrap-containers.json",
"test_data/snapshot_test_data/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.json":"divkit/public/test_data/snapshot_test_data/div-container/overlap-match-parent-inside-wrap-content-on-both-axis.json",
@@ -753,13 +753,15 @@ internal fun Long.fontSizeToPx(unit: DivSizeUnit, metrics: DisplayMetrics): Floa
internal fun ViewGroup.drawChildrenShadows(canvas: Canvas) {
children
.filter { it.visibility == View.VISIBLE }
.forEach { child ->
canvas.withSave {
translate(child.x, child.y)
rotate(child.rotation, child.pivotX, child.pivotY)
(child as? DivBorderSupports)?.getDivBorderDrawer()?.drawShadow(canvas)
}
}
.forEach { child -> child.drawShadow(canvas) }
}
internal fun View.drawShadow(canvas: Canvas) {
canvas.withSave {
translate(x, y)
rotate(rotation, pivotX, pivotY)
(this@drawShadow as? DivBorderSupports)?.getDivBorderDrawer()?.drawShadow(canvas)
}
}
internal fun View.extractParentContentAlignmentVertical(
@@ -3,7 +3,8 @@ package com.yandex.div.core.view2.divs.widgets
import android.content.Context
import android.graphics.Canvas
import android.util.AttributeSet
import com.yandex.div.core.view2.divs.drawChildrenShadows
import android.view.View
import com.yandex.div.core.view2.divs.drawShadow
import com.yandex.div.internal.widget.FrameContainerLayout
import com.yandex.div2.DivContainer
@@ -26,7 +27,13 @@ internal class DivFrameLayout @JvmOverloads constructor(
}
override fun dispatchDraw(canvas: Canvas) {
drawChildrenShadows(canvas)
dispatchDrawBorderClipped(canvas) { super.dispatchDraw(it) }
}
override fun drawChild(canvas: Canvas, child: View?, drawingTime: Long): Boolean {
if (child != null && child.visibility == VISIBLE) {
child.drawShadow(canvas)
}
return super.drawChild(canvas, child, drawingTime)
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

@@ -0,0 +1,78 @@
{
"description": "Shadows of children are drawn correctly in overlap container.",
"platforms": [
"android",
"ios",
"web"
],
"card": {
"log_id": "shadow_in_overlap_container",
"states": [
{
"state_id": 0,
"div": {
"type": "container",
"orientation": "overlap",
"height": {
"type": "fixed",
"value": 60
},
"width": {
"type":"fixed",
"value": 60
},
"items": [
{
"type": "container",
"background": [
{
"type": "solid",
"color": "#f0f0f0"
}
],
"height": {
"type": "match_parent"
},
"width": {
"type": "match_parent"
}
},
{
"type": "container",
"background": [
{
"type": "solid",
"color": "#F8604A"
}
],
"border": {
"has_shadow": true,
"shadow": {
"alpha": 0.5,
"blur": 10,
"color": "#000000",
"offset": {
"x": {
"value": 5.0
},
"y": {
"value": 5.0
}
}
}
},
"height": {
"type": "fixed",
"value": 40
},
"width": {
"type": "fixed",
"value": 40
}
}
]
}
}
]
}
}