Merge lp:~dandrader/platform-api/window_get_size into lp:platform-api

[Daniel d'Andrada]

Add ua_ui_window_get_size()

Pretty harmless change. Just exposes a bit more of mir functionalities.

Needed for the "qt as mir compositor" work.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/platform-api-ci/259/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-amd64-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-armhf-ci/93/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-trusty-i386-ci/93

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/259/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Since is API change, need to bump the package version.
Checklist please
Code change fine tho

review: Needs Fixing

[Gerry Boland (gerboland)]

dpkg-gensymbols: warning: some new symbols appeared in the symbols file: see diff output below
dpkg-gensymbols: warning: debian/libubuntu-application-api1/DEBIAN/symbols doesn't match completely debian/libubuntu-application-api1.symbols

You need to update the symbols file too

[Gerry Boland (gerboland)]

> Since is API change, need to bump the package version.
A better solution is to retarget this MR to lp:platform-api/devel
We'll bump the package version when promoting to trunk

[lp:~dandrader/platform-api/window_get_size]

212. By kevin gunn on 2014-05-06

merge from trunk

213. By Daniel d'Andrada on 2014-05-07

Added ua_ui_window_get_size()

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-31 17:59:47 +0000
+++ CMakeLists.txt	2014-04-17 14:18:01 +0000
@@ -3,7 +3,7 @@
 project(ubuntu-platform-api)
 
 set(UBUNTU_PLATFORM_API_VERSION_MAJOR 1)
-set(UBUNTU_PLATFORM_API_VERSION_MINOR 0)
+set(UBUNTU_PLATFORM_API_VERSION_MINOR 1)
 set(UBUNTU_PLATFORM_API_VERSION_PATCH 0)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-11 21:09:05 +0000
+++ debian/changelog	2014-04-17 14:18:01 +0000
@@ -1,3 +1,9 @@
+platform-api (0.21-0ubuntu1) trusty; urgency=medium
+
+  * Added ua_ui_window_get_size()
+
+ -- Daniel d'Andrada <[e-mail]>  Thu, 17 Apr 2014 11:14:41 -0300
+
 platform-api (0.20+14.04.20140411-0ubuntu1) trusty; urgency=low
 
   [ Gerry Boland ]

=== modified file 'include/ubuntu/application/ui/window.h'
--- include/ubuntu/application/ui/window.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/application/ui/window.h	2014-04-17 14:18:01 +0000
@@ -48,6 +48,12 @@
     ua_ui_window_get_id(
     	UAUiWindow *window);
     
+    UBUNTU_DLL_PUBLIC void
+    ua_ui_window_get_size(
+        UAUiWindow *window,
+        uint32_t *width,
+        uint32_t *height);
+
     UBUNTU_DLL_PUBLIC UStatus
     ua_ui_window_move(
         UAUiWindow *window,

=== modified file 'src/ubuntu/mirclient/ubuntu_application_api_mirclient.cpp'
--- src/ubuntu/mirclient/ubuntu_application_api_mirclient.cpp	2014-02-07 14:32:44 +0000
+++ src/ubuntu/mirclient/ubuntu_application_api_mirclient.cpp	2014-04-17 14:18:01 +0000
@@ -311,6 +311,16 @@
     delete window;
 }
 
+void
+ua_ui_window_get_size(
+    UAUiWindow *u_window,
+    uint32_t *width,
+    uint32_t *height)
+{
+    auto window = uamc::Window::from_u_window(u_window);
+    window->get_size(width, height);
+}
+
 UStatus ua_ui_window_move(UAUiWindow* u_window, uint32_t x, uint32_t y)
 {
     // TODO<papi,mir>: Implement. Assuming this should exist on mirclient?

=== modified file 'src/ubuntu/mirclient/window_mirclient.cpp'
--- src/ubuntu/mirclient/window_mirclient.cpp	2013-10-14 21:22:49 +0000
+++ src/ubuntu/mirclient/window_mirclient.cpp	2014-04-17 14:18:01 +0000
@@ -146,3 +146,11 @@
 {
     mir_surface_set_state(surface.get(), static_cast<MirSurfaceState>(state));
 }
+
+void uamc::Window::get_size(uint32_t *width, uint32_t *height)
+{
+    MirSurfaceParameters parameters;
+    mir_surface_get_parameters(surface.get(), &parameters);
+    *width = parameters.width;
+    *height = parameters.height;
+}

=== modified file 'src/ubuntu/mirclient/window_mirclient_priv.h'
--- src/ubuntu/mirclient/window_mirclient_priv.h	2013-10-08 19:35:03 +0000
+++ src/ubuntu/mirclient/window_mirclient_priv.h	2014-04-17 14:18:01 +0000
@@ -57,6 +57,8 @@
     UApplicationUiWindowState state() const;
     void set_state(const UApplicationUiWindowState);
 
+    void get_size(uint32_t *width, uint32_t *height);
+
 protected:
     Window(Window const&) = delete;
     Window& operator=(Window const&) = delete;