diff options
| author | Yuqian Yang <crupest@outlook.com> | 2018-10-04 16:52:11 +0000 |
|---|---|---|
| committer | Yuqian Yang <crupest@outlook.com> | 2018-10-04 16:52:11 +0000 |
| commit | 7e870dd16e2f5b41fa6c6f687723aaa50c16274d (patch) | |
| tree | be2b26a42dc9fde97379f98f035113e08e0bc331 /CruUI.vcxproj.filters | |
| parent | 30ecda8bb354d5982978af97aa90b5f49d9ea195 (diff) | |
| parent | c5384d496e9ed429ca2baa3ca5e586ff255235eb (diff) | |
| download | cru-7e870dd16e2f5b41fa6c6f687723aaa50c16274d.tar.gz cru-7e870dd16e2f5b41fa6c6f687723aaa50c16274d.tar.bz2 cru-7e870dd16e2f5b41fa6c6f687723aaa50c16274d.zip | |
Merge branch '12-layout' into 'master'
Resolve "Add padding, margin, border to Control."
Closes #12
See merge request crupest/CruUI!12
Diffstat (limited to 'CruUI.vcxproj.filters')
| -rw-r--r-- | CruUI.vcxproj.filters | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/CruUI.vcxproj.filters b/CruUI.vcxproj.filters index 683b3686..4c7ea868 100644 --- a/CruUI.vcxproj.filters +++ b/CruUI.vcxproj.filters @@ -54,9 +54,6 @@ <ClCompile Include="src\ui\controls\linear_layout.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="src\ui\controls\margin_container.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="src\ui\controls\text_block.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -69,10 +66,7 @@ <ClCompile Include="src\ui\events\ui_event.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="src\ui\controls\border.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="src\ui\controls\border_delegate.cpp"> + <ClCompile Include="src\ui\border_property.cpp"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> @@ -125,9 +119,6 @@ <ClInclude Include="src\ui\controls\linear_layout.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="src\ui\controls\margin_container.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="src\ui\controls\text_block.h"> <Filter>Header Files</Filter> </ClInclude> @@ -143,10 +134,7 @@ <ClInclude Include="src\ui\controls\text_control.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="src\ui\controls\border.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="src\ui\controls\border_delegate.h"> + <ClInclude Include="src\ui\border_property.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> |