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 /src/ui/controls/linear_layout.h | |
| 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 'src/ui/controls/linear_layout.h')
| -rw-r--r-- | src/ui/controls/linear_layout.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/controls/linear_layout.h b/src/ui/controls/linear_layout.h index 369824d4..997f28ea 100644 --- a/src/ui/controls/linear_layout.h +++ b/src/ui/controls/linear_layout.h @@ -32,8 +32,8 @@ namespace cru::ui::controls ~LinearLayout() override = default; protected: - Size OnMeasure(const Size& available_size) override; - void OnLayout(const Rect& rect) override; + Size OnMeasureContent(const Size& available_size) override; + void OnLayoutContent(const Rect& rect) override; private: Orientation orientation_; |