Merge lp:~lukas-kde/miral/shellchrome-windowinfo into lp:miral

[Lukáš Tinkl]

Add accessors for shell_chrome to WindowInfo

Add accessors for shell_chrome to WindowInfo

Needed for lp:1658117

[Alan Griffiths (alan-griffiths)]

A test would be nice

[Alan Griffiths (alan-griffiths)]

If you had written a test you'd find these symbols are not exported.

Running "make symbols" will update the symbols.map and "make check-symbols" will check debian/libmiral2.symbols

review: Needs Fixing

[lp:~lukas-kde/miral/shellchrome-windowinfo]

503. By Lukáš Tinkl on 2017-02-03

update the symbols

[Lukáš Tinkl (lukas-kde)]

Symbols updated

[Alan Griffiths (alan-griffiths)]

review: Approve

=== modified file 'debian/libmiral2.symbols'
--- debian/libmiral2.symbols	2017-02-02 17:30:41 +0000
+++ debian/libmiral2.symbols	2017-02-03 14:27:51 +0000
@@ -1,5 +1,7 @@
 libmiral.so.2 libmiral2 #MINVER#
  MIRAL_1.0@MIRAL_1.0 1.0.0
+ (c++)"miral::WindowInfo::shell_chrome(MirShellChrome)@MIRAL_1.2" 1.2.0
+ (c++)"miral::WindowInfo::shell_chrome() const@MIRAL_1.2" 1.2.0
  (c++)"miral::WindowInfo::height_inc(mir::geometry::detail::IntWrapper<mir::geometry::DeltaYTag>)@MIRAL_1.0" 1.0.0
  (c++)"miral::WindowInfo::max_aspect(miral::WindowSpecification::AspectRatio)@MIRAL_1.0" 1.0.0
  (c++)"miral::WindowInfo::max_height(mir::geometry::detail::IntWrapper<mir::geometry::HeightTag>)@MIRAL_1.0" 1.0.0
 
=== modified file 'include/miral/window_info.h'
--- include/miral/window_info.h	2017-01-13 18:17:01 +0000
+++ include/miral/window_info.h	2017-02-03 14:27:51 +0000
@@ -108,6 +108,9 @@
     auto confine_pointer() const -> MirPointerConfinementState;
     void confine_pointer(MirPointerConfinementState confinement);
 
+    auto shell_chrome() const -> MirShellChrome;
+    void shell_chrome(MirShellChrome chrome);
+
     /// This can be used by client code to store window manager specific information
     auto userdata() const -> std::shared_ptr<void>;
     void userdata(std::shared_ptr<void> userdata);
 
=== modified file 'miral/symbols.map'
--- miral/symbols.map	2017-02-02 17:30:41 +0000
+++ miral/symbols.map	2017-02-03 14:27:51 +0000
@@ -353,6 +353,7 @@
 MIRAL_1.2 {
 global:
   extern "C++" {
+    miral::WindowInfo::shell_chrome*;
     miral::WindowManagerTools::drag_window*;
   };
 } MIRAL_1.1;
 
=== modified file 'miral/window_info.cpp'
--- miral/window_info.cpp	2017-02-02 13:03:58 +0000
+++ miral/window_info.cpp	2017-02-03 14:27:51 +0000
@@ -61,6 +61,7 @@
     AspectRatio min_aspect;
     AspectRatio max_aspect;
     mir::optional_value<int> output_id;
+    MirShellChrome shell_chrome;
     std::shared_ptr<void> userdata;
 };
 
@@ -79,7 +80,8 @@
     width_inc{optional_value_or_default(params.width_inc(), DeltaX{1})},
     height_inc{optional_value_or_default(params.height_inc(), DeltaY{1})},
     min_aspect(optional_value_or_default(params.min_aspect(), AspectRatio{0U, std::numeric_limits<unsigned>::max()})),
-    max_aspect(optional_value_or_default(params.max_aspect(), AspectRatio{std::numeric_limits<unsigned>::max(), 0U}))
+    max_aspect(optional_value_or_default(params.max_aspect(), AspectRatio{std::numeric_limits<unsigned>::max(), 0U})),
+    shell_chrome(optional_value_or_default(params.shell_chrome(), mir_shell_chrome_normal))
 {
     if (params.output_id().is_set())
         output_id = params.output_id().value();
@@ -91,7 +93,8 @@
 miral::WindowInfo::Self::Self() :
     type{mir_window_type_normal},
     state{mir_window_state_unknown},
-    preferred_orientation{mir_orientation_mode_any}
+    preferred_orientation{mir_orientation_mode_any},
+    shell_chrome{mir_shell_chrome_normal}
 {
 }
 
@@ -570,6 +573,16 @@
     self->confine_pointer = confinement;
 }
 
+auto miral::WindowInfo::shell_chrome() const -> MirShellChrome
+{
+    return self->shell_chrome;
+}
+
+void miral::WindowInfo::shell_chrome(MirShellChrome chrome)
+{
+    self->shell_chrome = chrome;
+}
+
 auto miral::WindowInfo::name() const -> std::string
 {
     return self->name;