aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-11-10 14:37:55 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-11-10 17:33:25 -0600
commit0013447068dfde42c60fa802e5387e9bc4d0b2e2 (patch)
tree012f04462429e318f433f8885fac544ec488472e
parent9d3af7547bb790d39157dd36dfa862a1abf47beb (diff)
downloadwix-0013447068dfde42c60fa802e5387e9bc4d0b2e2.tar.gz
wix-0013447068dfde42c60fa802e5387e9bc4d0b2e2.tar.bz2
wix-0013447068dfde42c60fa802e5387e9bc4d0b2e2.zip
Move ImageList element back under Theme since it's not a control.
Diffstat
-rw-r--r--src/libs/dutil/WixToolset.DUtil/thmutil.cpp8
-rw-r--r--src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml11
-rw-r--r--src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml11
3 files changed, 16 insertions, 14 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
index b76d6483..b5dfbae4 100644
--- a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
@@ -1834,6 +1834,10 @@ static HRESULT ParseTheme(
1834 hr = ParseImages(hModule, wzRelativePath, pThemeElement, pTheme); 1834 hr = ParseImages(hModule, wzRelativePath, pThemeElement, pTheme);
1835 ThmExitOnFailure(hr, "Failed to parse theme images."); 1835 ThmExitOnFailure(hr, "Failed to parse theme images.");
1836 1836
1837 // Parse any image lists.
1838 hr = ParseImageLists(hModule, wzRelativePath, pThemeElement, pTheme);
1839 ThmExitOnFailure(hr, "Failed to parse image lists.");
1840
1837 // Parse the window element. 1841 // Parse the window element.
1838 hr = ParseWindow(hModule, wzRelativePath, pThemeElement, pTheme); 1842 hr = ParseWindow(hModule, wzRelativePath, pThemeElement, pTheme);
1839 ThmExitOnFailure(hr, "Failed to parse theme window element."); 1843 ThmExitOnFailure(hr, "Failed to parse theme window element.");
@@ -2598,10 +2602,6 @@ static HRESULT ParseWindow(
2598 ThmExitWithRootFailure(hr, E_INVALIDDATA, "Window elements must contain either the Caption or StringId attribute."); 2602 ThmExitWithRootFailure(hr, E_INVALIDDATA, "Window elements must contain either the Caption or StringId attribute.");
2599 } 2603 }
2600 2604
2601 // Parse any image lists.
2602 hr = ParseImageLists(hModule, wzRelativePath, pixn, pTheme);
2603 ThmExitOnFailure(hr, "Failed to parse image lists.");
2604
2605 // Parse the pages. 2605 // Parse the pages.
2606 hr = ParsePages(hModule, wzRelativePath, pixn, pTheme); 2606 hr = ParsePages(hModule, wzRelativePath, pixn, pTheme);
2607 ThmExitOnFailure(hr, "Failed to parse theme pages."); 2607 ThmExitOnFailure(hr, "Failed to parse theme pages.");
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml
index 7491ab1c..104474b8 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingTheme.xml
@@ -28,12 +28,13 @@
28 <Image Id="progressbar" ImageResource="30" /> 28 <Image Id="progressbar" ImageResource="30" />
29 <Image Id="progressbar_reverse" ImageResource="31" /> 29 <Image Id="progressbar_reverse" ImageResource="31" />
30 30
31 <ImageList Name="Stars">
32 <ImageListItem ImageResource="2" />
33 <ImageListItem ImageResource="3" />
34 <ImageListItem ImageResource="4" />
35 </ImageList>
36
31 <Window Width="600" Height="450" FontId="Default" Caption="BafThmUtilTestingTheme" HexStyle="10cf0000" AutoResize="yes"> 37 <Window Width="600" Height="450" FontId="Default" Caption="BafThmUtilTestingTheme" HexStyle="10cf0000" AutoResize="yes">
32 <ImageList Name="Stars">
33 <ImageListItem ImageResource="2" />
34 <ImageListItem ImageResource="3" />
35 <ImageListItem ImageResource="4" />
36 </ImageList>
37 <Page Name="Transparency"> 38 <Page Name="Transparency">
38 <Label X="6" Y="6" Width="-6" Height="94" FontId="Default"> 39 <Label X="6" Y="6" Width="-6" Height="94" FontId="Default">
39 This page has three versions of an image. The top image is a bitmap with a transparent background, the yellow star should be visible but its black background should not (this is currently broken). The middle image is the same bitmap except the black background is fully opaque so the yellow star should be visible on a black background. The bottom image in a PNG version of the top image and should look exactly the same. 40 This page has three versions of an image. The top image is a bitmap with a transparent background, the yellow star should be visible but its black background should not (this is currently broken). The middle image is the same bitmap except the black background is fully opaque so the yellow star should be visible on a black background. The bottom image in a PNG version of the top image and should look exactly the same.
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml
index 7e360544..718571db 100644
--- a/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml
+++ b/src/test/burn/TestData/Manual/BafThmutilTesting/theme/BafThmUtilTestingThemeLoose.xml
@@ -28,12 +28,13 @@
28 <Image Id="progressbar" ImageFile="progressbar.bmp" /> 28 <Image Id="progressbar" ImageFile="progressbar.bmp" />
29 <Image Id="progressbar_reverse" ImageFile="progressbar_reverse.bmp" /> 29 <Image Id="progressbar_reverse" ImageFile="progressbar_reverse.bmp" />
30 30
31 <ImageList Name="Stars">
32 <ImageListItem ImageFile="star_transparent.bmp" />
33 <ImageListItem ImageFile="star_opaque.bmp" />
34 <ImageListItem ImageFile="star_transparent.png" />
35 </ImageList>
36
31 <Window Width="600" Height="450" FontId="Default" Caption="BafThmUtilTestingTheme" HexStyle="10cf0000" AutoResize="yes"> 37 <Window Width="600" Height="450" FontId="Default" Caption="BafThmUtilTestingTheme" HexStyle="10cf0000" AutoResize="yes">
32 <ImageList Name="Stars">
33 <ImageListItem ImageFile="star_transparent.bmp" />
34 <ImageListItem ImageFile="star_opaque.bmp" />
35 <ImageListItem ImageFile="star_transparent.png" />
36 </ImageList>
37 <Page Name="Transparency"> 38 <Page Name="Transparency">
38 <Label X="6" Y="6" Width="-6" Height="94" FontId="Default"> 39 <Label X="6" Y="6" Width="-6" Height="94" FontId="Default">
39 This page has three versions of an image. The top image is a bitmap with a transparent background, the yellow star should be visible but its black background should not (this is currently broken). The middle image is the same bitmap except the black background is fully opaque so the yellow star should be visible on a black background. The bottom image in a PNG version of the top image and should look exactly the same. 40 This page has three versions of an image. The top image is a bitmap with a transparent background, the yellow star should be visible but its black background should not (this is currently broken). The middle image is the same bitmap except the black background is fully opaque so the yellow star should be visible on a black background. The bottom image in a PNG version of the top image and should look exactly the same.
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 06:52:56 +0000