소스 검색

LibGUI: Adjust OpacitySlider min size for consistency

22 is the size usually used for default widget height, like Buttons and
Labels.
FrHun 2 년 전
부모
커밋
cb872f5c9a
1개의 변경된 파일4개의 추가작업 그리고 5개의 파일을 삭제
  1. 4 5
      Userland/Libraries/LibGUI/OpacitySlider.cpp

+ 4 - 5
Userland/Libraries/LibGUI/OpacitySlider.cpp

@@ -22,6 +22,7 @@ OpacitySlider::OpacitySlider(Gfx::Orientation orientation)
     set_min(0);
     set_min(0);
     set_max(100);
     set_max(100);
     set_value(100);
     set_value(100);
+    set_preferred_size(SpecialDimension::Fit);
 }
 }
 
 
 Gfx::IntRect OpacitySlider::frame_inner_rect() const
 Gfx::IntRect OpacitySlider::frame_inner_rect() const
@@ -192,17 +193,15 @@ void OpacitySlider::mousewheel_event(MouseEvent& event)
 Optional<UISize> OpacitySlider::calculated_min_size() const
 Optional<UISize> OpacitySlider::calculated_min_size() const
 {
 {
     if (orientation() == Gfx::Orientation::Vertical)
     if (orientation() == Gfx::Orientation::Vertical)
-        return { { 20, 40 } };
-    else
-        return { { 40, 20 } };
+        return { { 22, 40 } };
+    return { { 40, 22 } };
 }
 }
 
 
 Optional<UISize> OpacitySlider::calculated_preferred_size() const
 Optional<UISize> OpacitySlider::calculated_preferred_size() const
 {
 {
     if (orientation() == Gfx::Orientation::Vertical)
     if (orientation() == Gfx::Orientation::Vertical)
         return { { SpecialDimension::Shrink, SpecialDimension::OpportunisticGrow } };
         return { { SpecialDimension::Shrink, SpecialDimension::OpportunisticGrow } };
-    else
-        return { { SpecialDimension::OpportunisticGrow, SpecialDimension::Shrink } };
+    return { { SpecialDimension::OpportunisticGrow, SpecialDimension::Shrink } };
 }
 }
 
 
 }
 }