Merge lp:~alan-griffiths/miral/simplify-size-increments into lp:miral

[Alan Griffiths]

Simplify width/height increments as "no increment" is logically the same as increment 1

[Gerry Boland (gerboland)]

LGTM!

review: Approve

[Alexandros Frantzis (afrantzis)]

OK.

review: Approve

=== modified file 'include/miral/window_info.h'
--- include/miral/window_info.h	2016-06-22 13:38:48 +0000
+++ include/miral/window_info.h	2016-08-03 14:05:23 +0000
@@ -84,13 +84,11 @@
     auto max_height() const -> mir::geometry::Height;
     void max_height(mir::geometry::Height max_height);
 
-    bool has_width_inc() const;
     auto width_inc() const -> mir::geometry::DeltaX;
-    void width_inc(mir::optional_value<mir::geometry::DeltaX> width_inc);
+    void width_inc(mir::geometry::DeltaX width_inc);
 
-    bool has_height_inc() const;
     auto height_inc() const -> mir::geometry::DeltaY;
-    void height_inc(mir::optional_value<mir::geometry::DeltaY> height_inc);
+    void height_inc(mir::geometry::DeltaY height_inc);
 
     bool has_min_aspect() const;
     auto min_aspect() const -> AspectRatio;

=== modified file 'miral/window_info.cpp'
--- miral/window_info.cpp	2016-07-22 15:18:34 +0000
+++ miral/window_info.cpp	2016-08-03 14:05:23 +0000
@@ -49,8 +49,8 @@
     mir::geometry::Height max_height;
     MirOrientationMode preferred_orientation;
 
-    mir::optional_value<mir::geometry::DeltaX> width_inc;
-    mir::optional_value<mir::geometry::DeltaY> height_inc;
+    mir::geometry::DeltaX width_inc;
+    mir::geometry::DeltaY height_inc;
     mir::optional_value<AspectRatio> min_aspect;
     mir::optional_value<AspectRatio> max_aspect;
     mir::optional_value<int> output_id;
@@ -68,8 +68,8 @@
     max_width{optional_value_or_default(params.max_width(), Width{std::numeric_limits<int>::max()})},
     max_height{optional_value_or_default(params.max_height(), Height{std::numeric_limits<int>::max()})},
     preferred_orientation{optional_value_or_default(params.preferred_orientation(), mir_orientation_mode_any)},
-    width_inc{params.width_inc()},
-    height_inc{params.height_inc()},
+    width_inc{optional_value_or_default(params.width_inc(), DeltaX{1})},
+    height_inc{optional_value_or_default(params.height_inc(), DeltaY{1})},
     min_aspect{},
     max_aspect{}
 {
@@ -283,7 +283,6 @@
     if (max_height() < new_size.height)
         new_size.height = max_height();
 
-    if (has_width_inc())
     {
         auto const width = new_size.width.as_int() - min_width().as_int();
         auto inc = width_inc().as_int();
@@ -291,7 +290,6 @@
             new_size.width = min_width() + DeltaX{inc*(((2L*width + inc)/2)/inc)};
     }
 
-    if (has_height_inc())
     {
         auto const height = new_size.height.as_int() - min_height().as_int();
         auto inc = height_inc().as_int();
@@ -472,32 +470,22 @@
     self->userdata = userdata;
 }
 
-bool miral::WindowInfo::has_width_inc() const
-{
-    return self->width_inc.is_set();
-}
-
 auto miral::WindowInfo::width_inc() const -> mir::geometry::DeltaX
 {
-    return self->width_inc.value();
+    return self->width_inc;
 }
 
-void miral::WindowInfo::width_inc(mir::optional_value<mir::geometry::DeltaX> width_inc)
+void miral::WindowInfo::width_inc(DeltaX width_inc)
 {
     self->width_inc = width_inc;
 }
 
-bool miral::WindowInfo::has_height_inc() const
-{
-    return self->height_inc.is_set();
-}
-
 auto miral::WindowInfo::height_inc() const -> mir::geometry::DeltaY
 {
-    return self->height_inc.value();
+    return self->height_inc;
 }
 
-void miral::WindowInfo::height_inc(mir::optional_value<mir::geometry::DeltaY> height_inc)
+void miral::WindowInfo::height_inc(mir::geometry::DeltaY height_inc)
 {
     self->height_inc = height_inc;
 }