Skip to content

Commit 41da3cb

Browse files
committed
Updated Sample Code
> change settingsservice in js service template - "settingsservice" was changed to run in session side. - Change it to systemservice/clock/getTime is in host side. - Change service's method name "locale" to "time" > change rect size in built-in nativeqt app - QRect set via geometry() is not working. Get the size from windowRect > link the libEGL directly
1 parent 89873e7 commit 41da3cb

6 files changed

Lines changed: 14 additions & 17 deletions

File tree

js-services/com.example.service.js/com_example_service_js.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,17 @@ var service = new Service("com.example.service.js");
2121

2222
// A method that always returns the same value
2323
service.register("hello", function(message) {
24+
console.log("[com.example.service.js]", "SERVICE_METHOD_CALLED:hello");
2425
message.respond({
2526
answer: "Hello, JS Service!!"
2627
});
2728
});
2829

2930
// Call another service
30-
service.register("locale", function(message) {
31-
service.call("luna://com.webos.settingsservice/getSystemSettings", {"key":"localeInfo"}, function(m2) {
32-
console.log("[com.example.service.js]", "LOCALE_CALLBACK : get locale response");
33-
var response = "You appear to have your locale set to: " + m2.payload.settings.localeInfo.locales.UI;
34-
message.respond({
35-
message: response
36-
});
31+
service.register("time", function(message) {
32+
service.call("luna://com.webos.service.systemservice/clock/getTime", {}, function(m2) {
33+
console.log("[com.example.service.js]", "SERVICE_METHOD_CALLED:com.webos.service.systemservice/clock/getTime");
34+
const response = "You appear to have your UTC set to: " + m2.payload.utc;
35+
message.respond({message: response});
3736
});
3837
});
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"com.example.service.js": [
3-
"settings.read", "activities.manage"
3+
"time", "activities.manage"
44
]
55
}

native-apps/built-in/com.example.app.nativeqt/MyOpenGLWindow.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
#include <QtGui/QOpenGLPaintDevice>
5454
#include <QtGui/QPainter>
5555

56-
MyOpenGLWindow::MyOpenGLWindow(QWindow *parent)
57-
: QWindow(parent)
56+
MyOpenGLWindow::MyOpenGLWindow(QRect rect)
57+
: m_windowRect(rect)
5858
, m_device(nullptr)
5959
{
6060
setSurfaceType(QWindow::OpenGLSurface);
@@ -82,7 +82,7 @@ void MyOpenGLWindow::render()
8282
m_device->setSize(size() * devicePixelRatio());
8383
m_device->setDevicePixelRatio(devicePixelRatio());
8484

85-
QRect rect = geometry();
85+
QRect rect = QRect(0, 0, m_windowRect.width(), m_windowRect.height());
8686
QPainter painter(m_device);
8787

8888
QFont font = painter.font();

native-apps/built-in/com.example.app.nativeqt/MyOpenGLWindow.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class MyOpenGLWindow : public QWindow, protected QOpenGLFunctions
6464
{
6565
Q_OBJECT
6666
public:
67-
explicit MyOpenGLWindow(QWindow *parent = 0);
67+
MyOpenGLWindow(QRect rect);
6868
~MyOpenGLWindow();
6969

7070
virtual void render();
@@ -73,6 +73,7 @@ class MyOpenGLWindow : public QWindow, protected QOpenGLFunctions
7373
void exposeEvent(QExposeEvent *event) override;
7474

7575
private:
76+
QRect m_windowRect;
7677
QOpenGLContext *m_context;
7778
QOpenGLPaintDevice *m_device;
7879
};

native-apps/built-in/com.example.app.nativeqt/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
3131

3232
QScreen *screen = QGuiApplication::primaryScreen();
3333
QRect screenGeometry = screen->geometry();
34-
MyOpenGLWindow window;
34+
MyOpenGLWindow window(screenGeometry);
3535
window.resize(screenGeometry.width(), screenGeometry.height());
3636
window.show();
3737

native-apps/external/com.sample.waylandegl/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ include_directories(${WLCLIENT_INCLUDE_DIRS})
2929
pkg_check_modules(WLEGL REQUIRED wayland-egl)
3030
include_directories(${WLEGL_INCLUDE_DIRS})
3131

32-
pkg_check_modules(EGL REQUIRED egl)
33-
include_directories(${EGL_INCLUDE_DIRS})
34-
3532
pkg_check_modules(GLESV2 REQUIRED glesv2)
3633
include_directories(${GLESV2_INCLUDE_DIRS})
3734

@@ -48,7 +45,7 @@ set_target_properties(${BIN_NAME} PROPERTIES LINKER_LANGUAGE C)
4845
target_link_libraries (${BIN_NAME}
4946
${WLCLIENT_LDFLAGS}
5047
${WLEGL_LDFLAGS}
51-
${EGL_LDFLAGS}
48+
-lEGL
5249
${GLESV2_LDFLAGS}
5350
)
5451

0 commit comments

Comments
 (0)