Skip to content

Commit 8a3e7d0

Browse files
BlueZeeKingBlueZeeKing
committed
layout: use generic get preferred size whenever possible
1 parent ea09f17 commit 8a3e7d0

8 files changed

Lines changed: 24 additions & 98 deletions

File tree

‎src/element/checkbox/Checkmark.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ Hyprutils::Math::Vector2D CCheckmarkElement::size() {
4747
}
4848

4949
std::optional<Vector2D> CCheckmarkElement::preferredSize(const Hyprutils::Math::Vector2D& parent) {
50-
return m_data.size.calculate(parent);
50+
return impl->getPreferredSizeGeneric(m_data.size, parent);
5151
}
5252

5353
std::optional<Vector2D> CCheckmarkElement::minimumSize(const Hyprutils::Math::Vector2D& parent) {
54-
return m_data.size.calculate(parent);
54+
return impl->getPreferredSizeGeneric(m_data.size, parent);
5555
}
5656

5757
std::optional<Vector2D> CCheckmarkElement::maximumSize(const Hyprutils::Math::Vector2D& parent) {
58-
return m_data.size.calculate(parent);
58+
return impl->getPreferredSizeGeneric(m_data.size, parent);
5959
}

‎src/element/combobox/Combobox.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,15 +252,15 @@ Hyprutils::Math::Vector2D CComboboxElement::size() {
252252
}
253253

254254
std::optional<Vector2D> CComboboxElement::preferredSize(const Hyprutils::Math::Vector2D& parent) {
255-
return m_impl->data.size.calculate(parent);
255+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
256256
}
257257

258258
std::optional<Vector2D> CComboboxElement::minimumSize(const Hyprutils::Math::Vector2D& parent) {
259-
return m_impl->data.size.calculate(parent);
259+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
260260
}
261261

262262
std::optional<Vector2D> CComboboxElement::maximumSize(const Hyprutils::Math::Vector2D& parent) {
263-
return m_impl->data.size.calculate(parent);
263+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
264264
}
265265

266266
bool CComboboxElement::acceptsMouseInput() {

‎src/element/combobox/DropdownHandle.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ Hyprutils::Math::Vector2D CDropdownHandleElement::size() {
4141
}
4242

4343
std::optional<Vector2D> CDropdownHandleElement::preferredSize(const Hyprutils::Math::Vector2D& parent) {
44-
return m_data.size.calculate(parent);
44+
return impl->getPreferredSizeGeneric(m_data.size, parent);
4545
}
4646

4747
std::optional<Vector2D> CDropdownHandleElement::minimumSize(const Hyprutils::Math::Vector2D& parent) {
48-
return m_data.size.calculate(parent);
48+
return impl->getPreferredSizeGeneric(m_data.size, parent);
4949
}
5050

5151
std::optional<Vector2D> CDropdownHandleElement::maximumSize(const Hyprutils::Math::Vector2D& parent) {
52-
return m_data.size.calculate(parent);
52+
return impl->getPreferredSizeGeneric(m_data.size, parent);
5353
}

‎src/element/progressBar/ProgressBar.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,15 @@ Hyprutils::Math::Vector2D CProgressBarElement::size() {
146146
}
147147

148148
std::optional<Vector2D> CProgressBarElement::preferredSize(const Hyprutils::Math::Vector2D& parent) {
149-
return m_impl->data.size.calculate(parent);
149+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
150150
}
151151

152152
std::optional<Vector2D> CProgressBarElement::minimumSize(const Hyprutils::Math::Vector2D& parent) {
153-
return m_impl->data.size.calculate(parent);
153+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
154154
}
155155

156156
std::optional<Vector2D> CProgressBarElement::maximumSize(const Hyprutils::Math::Vector2D& parent) {
157-
return m_impl->data.size.calculate(parent);
157+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
158158
}
159159

160160
bool CProgressBarElement::positioningDependsOnChild() {

‎src/element/slider/Slider.cpp‎

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -188,49 +188,15 @@ Hyprutils::Math::Vector2D CSliderElement::size() {
188188
}
189189

190190
std::optional<Vector2D> CSliderElement::preferredSize(const Hyprutils::Math::Vector2D& parent) {
191-
auto s = m_impl->data.size.calculate(parent);
192-
193-
if (s.x != -1 && s.y != -1)
194-
return s;
195-
196-
const auto CALC = m_impl->layout->preferredSize(parent).value() + Vector2D{1, 1};
197-
198-
if (s.x == -1)
199-
s.x = CALC.x;
200-
if (s.y == -1)
201-
s.y = CALC.y;
202-
203-
return s;
191+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
204192
}
205193

206194
std::optional<Vector2D> CSliderElement::minimumSize(const Hyprutils::Math::Vector2D& parent) {
207-
auto s = m_impl->data.size.calculate(parent);
208-
if (s.x != -1 && s.y != -1)
209-
return s;
210-
211-
const auto CALC = m_impl->layout->preferredSize(parent).value() + Vector2D{1, 1};
212-
213-
if (s.x == -1)
214-
s.x = CALC.x;
215-
if (s.y == -1)
216-
s.y = CALC.y;
217-
218-
return s;
195+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
219196
}
220197

221198
std::optional<Vector2D> CSliderElement::maximumSize(const Hyprutils::Math::Vector2D& parent) {
222-
auto s = m_impl->data.size.calculate(parent);
223-
if (s.x != -1 && s.y != -1)
224-
return s;
225-
226-
const auto CALC = m_impl->layout->preferredSize(parent).value() + Vector2D{1, 1};
227-
228-
if (s.x == -1)
229-
s.x = CALC.x;
230-
if (s.y == -1)
231-
s.y = CALC.y;
232-
233-
return s;
199+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
234200
}
235201

236202
bool CSliderElement::acceptsMouseInput() {

‎src/element/spinbox/Spinbox.cpp‎

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -95,49 +95,15 @@ Hyprutils::Math::Vector2D CSpinboxElement::size() {
9595
}
9696

9797
std::optional<Vector2D> CSpinboxElement::preferredSize(const Hyprutils::Math::Vector2D& parent) {
98-
auto s = m_impl->data.size.calculate(parent);
99-
100-
if (s.x != -1 && s.y != -1)
101-
return s;
102-
103-
const auto CALC = m_impl->layout->preferredSize(parent).value() + Vector2D{1, 1};
104-
105-
if (s.x == -1)
106-
s.x = CALC.x;
107-
if (s.y == -1)
108-
s.y = CALC.y;
109-
110-
return s;
98+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
11199
}
112100

113101
std::optional<Vector2D> CSpinboxElement::minimumSize(const Hyprutils::Math::Vector2D& parent) {
114-
auto s = m_impl->data.size.calculate(parent);
115-
if (s.x != -1 && s.y != -1)
116-
return s;
117-
118-
const auto CALC = m_impl->layout->preferredSize(parent).value() + Vector2D{1, 1};
119-
120-
if (s.x == -1)
121-
s.x = CALC.x;
122-
if (s.y == -1)
123-
s.y = CALC.y;
124-
125-
return s;
102+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
126103
}
127104

128105
std::optional<Vector2D> CSpinboxElement::maximumSize(const Hyprutils::Math::Vector2D& parent) {
129-
auto s = m_impl->data.size.calculate(parent);
130-
if (s.x != -1 && s.y != -1)
131-
return s;
132-
133-
const auto CALC = m_impl->layout->preferredSize(parent).value() + Vector2D{1, 1};
134-
135-
if (s.x == -1)
136-
s.x = CALC.x;
137-
if (s.y == -1)
138-
s.y = CALC.y;
139-
140-
return s;
106+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
141107
}
142108

143109
bool CSpinboxElement::acceptsMouseInput() {

‎src/element/spinbox/SpinboxAngle.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ Hyprutils::Math::Vector2D CSpinboxAngleElement::size() {
6868
}
6969

7070
std::optional<Vector2D> CSpinboxAngleElement::preferredSize(const Hyprutils::Math::Vector2D& parent) {
71-
return m_data.size.calculate(parent);
71+
return impl->getPreferredSizeGeneric(m_data.size, parent);
7272
}
7373

7474
std::optional<Vector2D> CSpinboxAngleElement::minimumSize(const Hyprutils::Math::Vector2D& parent) {
75-
return m_data.size.calculate(parent);
75+
return impl->getPreferredSizeGeneric(m_data.size, parent);
7676
}
7777

7878
std::optional<Vector2D> CSpinboxAngleElement::maximumSize(const Hyprutils::Math::Vector2D& parent) {
79-
return m_data.size.calculate(parent);
79+
return impl->getPreferredSizeGeneric(m_data.size, parent);
8080
}
8181

8282
bool CSpinboxAngleElement::acceptsMouseInput() {

‎src/element/textbox/Textbox.cpp‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -785,21 +785,15 @@ Hyprutils::Math::Vector2D CTextboxElement::size() {
785785
}
786786

787787
std::optional<Vector2D> CTextboxElement::preferredSize(const Hyprutils::Math::Vector2D& parent) {
788-
return m_impl->data.size.calculate(parent);
788+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
789789
}
790790

791791
std::optional<Vector2D> CTextboxElement::minimumSize(const Hyprutils::Math::Vector2D& parent) {
792-
auto s = m_impl->data.size.calculate(parent);
793-
if (s.x != -1 && s.y != -1)
794-
return s;
795-
return Vector2D{0, 0};
792+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
796793
}
797794

798795
std::optional<Vector2D> CTextboxElement::maximumSize(const Hyprutils::Math::Vector2D& parent) {
799-
auto s = m_impl->data.size.calculate(parent);
800-
if (s.x != -1 && s.y != -1)
801-
return s;
802-
return std::nullopt;
796+
return impl->getPreferredSizeGeneric(m_impl->data.size, parent);
803797
}
804798

805799
bool CTextboxElement::acceptsMouseInput() {

0 commit comments

Comments
 (0)