Skip to content

Commit cecc928

Browse files
authored
Feature - Container Queries (#16846)
* add container queries * make visual query provider SetSize virtual * fix container name matching * add tests * move border container implementation up to decorator * move container query demo to ControlCatalog * make QueryProvider internal * update container behavior in toplevelRename Query to StyleQuery and make IContainer internal * fix comment typos * remove unused usings * isolate container tests * update api * fix tests * fix no-selector styles in containers being applied all the time * simplify container search * add docs to container properties * addressed api review * remove weird unmerge cooments * remove width and height event container subscriptions when visual is detached
1 parent b09e0d5 commit cecc928

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2439
-11
lines changed

Avalonia.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tizen", "Tizen", "{D1300000
274274
EndProject
275275
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Tizen", "src\Tizen\Avalonia.Tizen\Avalonia.Tizen.csproj", "{DFFBDBF5-5DBE-47ED-9EAE-D40B75AC99E8}"
276276
EndProject
277-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.Tizen", "samples\ControlCatalog.Tizen\ControlCatalog.Tizen.csproj", "{A0B29221-2B6F-4B29-A4D5-2227811B5915}"
277+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.Tizen", "samples\ControlCatalog.Tizen\ControlCatalog.Tizen.csproj", "{A0B29221-2B6F-4B29-A4D5-2227811B5915}"
278278
EndProject
279279
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Metal", "src\Avalonia.Metal\Avalonia.Metal.csproj", "{60B4ED1F-ECFA-453B-8A70-1788261C8355}"
280280
EndProject
69.9 KB
Loading
52.6 KB
Loading
52.9 KB
Loading
95 KB
Loading
67.5 KB
Loading
107 KB
Loading
60.1 KB
Loading

samples/ControlCatalog/ControlCatalog.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@
1515
<AvaloniaResource Include="Assets\*" />
1616
<AvaloniaResource Include="Assets\Fonts\*" />
1717
</ItemGroup>
18+
<ItemGroup>
19+
<None Remove="Assets\image1.jpg" />
20+
<None Remove="Assets\image2.jpg" />
21+
<None Remove="Assets\image3.jpg" />
22+
<None Remove="Assets\image4.jpg" />
23+
<None Remove="Assets\image5.jpg" />
24+
<None Remove="Assets\image6.jpg" />
25+
<None Remove="Assets\image7.jpg" />
26+
</ItemGroup>
1827
<ItemGroup>
1928
<EmbeddedResource Include="Assets\Fonts\SourceSansPro-Bold.ttf" />
2029
<EmbeddedResource Include="Assets\Fonts\SourceSansPro-BoldItalic.ttf" />

samples/ControlCatalog/MainView.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@
6060
<TabItem Header="ComboBox">
6161
<pages:ComboBoxPage />
6262
</TabItem>
63+
<TabItem Header="Container Queries">
64+
<pages:ContainerQueryPage />
65+
</TabItem>
6366
<TabItem Header="ContextFlyout">
6467
<pages:ContextFlyoutPage />
6568
</TabItem>

0 commit comments

Comments
 (0)