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 | |
| 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')
| -rw-r--r-- | CruUI.vcxproj | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/CruUI.vcxproj b/CruUI.vcxproj index 975d74d8..23205792 100644 --- a/CruUI.vcxproj +++ b/CruUI.vcxproj @@ -121,15 +121,12 @@ <ClCompile Include="src\timer.cpp" /> <ClCompile Include="src\ui\animations\animation.cpp" /> <ClCompile Include="src\ui\control.cpp" /> - <ClCompile Include="src\ui\controls\border.cpp" /> - <ClCompile Include="src\ui\controls\border_delegate.cpp" /> + <ClCompile Include="src\ui\border_property.cpp" /> <ClCompile Include="src\ui\controls\button.cpp" /> <ClCompile Include="src\ui\controls\linear_layout.cpp" /> - <ClCompile Include="src\ui\controls\margin_container.cpp" /> <ClCompile Include="src\ui\controls\text_block.cpp" /> <ClCompile Include="src\ui\controls\text_box.cpp" /> - <ClInclude Include="src\ui\controls\border.h" /> - <ClInclude Include="src\ui\controls\border_delegate.h" /> + <ClInclude Include="src\ui\border_property.h" /> <ClInclude Include="src\ui\controls\text_control.h" /> <ClCompile Include="src\ui\controls\toggle_button.cpp" /> <ClCompile Include="src\ui\events\ui_event.cpp" /> @@ -151,7 +148,6 @@ <ClInclude Include="src\ui\control.h" /> <ClInclude Include="src\ui\controls\button.h" /> <ClInclude Include="src\ui\controls\linear_layout.h" /> - <ClInclude Include="src\ui\controls\margin_container.h" /> <ClInclude Include="src\ui\controls\text_block.h" /> <ClInclude Include="src\ui\controls\text_box.h" /> <ClCompile Include="src\ui\controls\text_control.cpp" /> |