Peter M. Groen / dali-demo

Commit 2c8b4e8031bf14737a8b44625eef69ba51543c1d

Authored by Eunki, Hong
1 parent 60284578

Fix svace issue at window-example.cpp 

Initialize some uninitialized values

Change-Id: I99cfa2030880269d3f7b069a56877d921e1e8708
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
Inline Side-by-side
Showing 1 changed file with 79 additions and 75 deletions
examples/window/window-example.cpp
  View file @2c8b4e8
@@ -33,10 +33,14 @@ class WindowExampleController : public ConnectionTracker @@ -33,10 +33,14 @@ class WindowExampleController : public ConnectionTracker
33 public: 33 public:
34 WindowExampleController(Application& application) 34 WindowExampleController(Application& application)
35 : mApplication(application), 35 : mApplication(application),
36 - manual_rotation_flag(false),  
37 - rotation_count(0), 36 + manualRotationFlag(false),
  37 + rotationCount(0),
38 rot(0), 38 rot(0),
39 - bColor(0) 39 + enableTimer(false),
  40 + bChangedOrientation(false),
  41 + isRotating(false),
  42 + bColor(false),
  43 + currentOrientation(Dali::WindowOrientation::NO_ORIENTATION_PREFERENCE)
40 { 44 {
41 // Connect to the Application's Init signal 45 // Connect to the Application's Init signal
42 mApplication.InitSignal().Connect(this, &WindowExampleController::Create); 46 mApplication.InitSignal().Connect(this, &WindowExampleController::Create);
@@ -60,10 +64,10 @@ public: @@ -60,10 +64,10 @@ public:
60 window.SetType(WindowType::NOTIFICATION); 64 window.SetType(WindowType::NOTIFICATION);
61 window.SetNotificationLevel(WindowNotificationLevel::MEDIUM); 65 window.SetNotificationLevel(WindowNotificationLevel::MEDIUM);
62 66
63 - currentOrientation = Dali::WindowOrientation::PORTRAIT;  
64 - enableTimer = false;  
65 - bChangedOrientation = false;  
66 - manual_rotation_flag = false; 67 + currentOrientation = Dali::WindowOrientation::PORTRAIT;
  68 + enableTimer = false;
  69 + bChangedOrientation = false;
  70 + manualRotationFlag = false;
67 71
68 // Add a text label to the window 72 // Add a text label to the window
69 TextLabel textLabel = TextLabel::New("Window Example"); 73 TextLabel textLabel = TextLabel::New("Window Example");
@@ -220,13 +224,13 @@ public: @@ -220,13 +224,13 @@ public:
220 { 224 {
221 if(touch.GetState(0) == PointState::DOWN) 225 if(touch.GetState(0) == PointState::DOWN)
222 { 226 {
223 - const int local_x = static_cast<int>(touch.GetLocalPosition(0).x);  
224 - const int local_y = static_cast<int>(touch.GetLocalPosition(0).y);  
225 - const int global_x = static_cast<int>(touch.GetScreenPosition(0).x);  
226 - const int global_y = static_cast<int>(touch.GetScreenPosition(0).y); 227 + const int localX = static_cast<int>(touch.GetLocalPosition(0).x);
  228 + const int localY = static_cast<int>(touch.GetLocalPosition(0).y);
  229 + const int globalX = static_cast<int>(touch.GetScreenPosition(0).x);
  230 + const int globalY = static_cast<int>(touch.GetScreenPosition(0).y);
227 231
228 - DALI_LOG_RELEASE_INFO("Main Window Touch Event : x:%d, y:%d\n", local_x, local_y);  
229 - DALI_LOG_RELEASE_INFO("global position: x:%d, y:%d\n", global_x, global_y); 232 + DALI_LOG_RELEASE_INFO("Main Window Touch Event : x:%d, y:%d\n", localX, localY);
  233 + DALI_LOG_RELEASE_INFO("global position: x:%d, y:%d\n", globalX, globalY);
230 234
231 Dali::Window window = mApplication.GetWindow(); 235 Dali::Window window = mApplication.GetWindow();
232 Window::WindowSize windowSize = window.GetSize(); 236 Window::WindowSize windowSize = window.GetSize();
@@ -234,44 +238,44 @@ public: @@ -234,44 +238,44 @@ public:
234 DALI_LOG_RELEASE_INFO("window size: w:%d, h:%d\n", windowSize.GetWidth(), windowSize.GetHeight()); 238 DALI_LOG_RELEASE_INFO("window size: w:%d, h:%d\n", windowSize.GetWidth(), windowSize.GetHeight());
235 DevelWindow::EnableFloatingMode(window, true); 239 DevelWindow::EnableFloatingMode(window, true);
236 240
237 - if((local_x < MARGIN) && (local_y < MARGIN)) // left top corner 241 + if((localX < MARGIN) && (localY < MARGIN)) // left top corner
238 { 242 {
239 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP_LEFT\n", local_x, local_y); 243 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP_LEFT\n", localX, localY);
240 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::TOP_LEFT); 244 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::TOP_LEFT);
241 } 245 }
242 - else if((local_x > (windowSize.GetWidth() - MARGIN)) && (local_y < MARGIN)) // rigth top corner 246 + else if((localX > (windowSize.GetWidth() - MARGIN)) && (localY < MARGIN)) // rigth top corner
243 { 247 {
244 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP_RIGHT\n", local_x, local_y); 248 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP_RIGHT\n", localX, localY);
245 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::TOP_RIGHT); 249 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::TOP_RIGHT);
246 } 250 }
247 - else if((local_x > MARGIN) && (local_x < (windowSize.GetWidth() - MARGIN)) && (local_y < MARGIN)) 251 + else if((localX > MARGIN) && (localX < (windowSize.GetWidth() - MARGIN)) && (localY < MARGIN))
248 { 252 {
249 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP\n", local_x, local_y); 253 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP\n", localX, localY);
250 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::TOP); 254 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::TOP);
251 } 255 }
252 - else if((local_x < MARGIN) && (local_y < (windowSize.GetHeight() - MARGIN)) && (local_y > MARGIN)) 256 + else if((localX < MARGIN) && (localY < (windowSize.GetHeight() - MARGIN)) && (localY > MARGIN))
253 { 257 {
254 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP\n", local_x, local_y); 258 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP\n", localX, localY);
255 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::LEFT); 259 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::LEFT);
256 } 260 }
257 - else if((local_x > (windowSize.GetWidth() - MARGIN)) && (local_y < (windowSize.GetHeight() - MARGIN)) && (local_y > MARGIN)) 261 + else if((localX > (windowSize.GetWidth() - MARGIN)) && (localY < (windowSize.GetHeight() - MARGIN)) && (localY > MARGIN))
258 { 262 {
259 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: LEFT\n", local_x, local_y); 263 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: LEFT\n", localX, localY);
260 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::RIGHT); 264 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::RIGHT);
261 } 265 }
262 - else if((local_x < MARGIN) && (local_y > (windowSize.GetHeight() - MARGIN))) // left bottom corner 266 + else if((localX < MARGIN) && (localY > (windowSize.GetHeight() - MARGIN))) // left bottom corner
263 { 267 {
264 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: RIGHT\n", local_x, local_y); 268 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: RIGHT\n", localX, localY);
265 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::BOTTOM_LEFT); 269 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::BOTTOM_LEFT);
266 } 270 }
267 - else if((local_x > (windowSize.GetWidth() - MARGIN)) && (local_y > (windowSize.GetHeight() - MARGIN))) // right bottom corner 271 + else if((localX > (windowSize.GetWidth() - MARGIN)) && (localY > (windowSize.GetHeight() - MARGIN))) // right bottom corner
268 { 272 {
269 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: BOTTOM_RIGHT\n", local_x, local_y); 273 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: BOTTOM_RIGHT\n", localX, localY);
270 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::BOTTOM_RIGHT); 274 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::BOTTOM_RIGHT);
271 } 275 }
272 else 276 else
273 { 277 {
274 - DALI_LOG_RELEASE_INFO("RequestMoveToServer\n", local_x, local_y); 278 + DALI_LOG_RELEASE_INFO("RequestMoveToServer\n", localX, localY);
275 DevelWindow::RequestMoveToServer(window); 279 DevelWindow::RequestMoveToServer(window);
276 } 280 }
277 } 281 }
@@ -336,13 +340,13 @@ public: @@ -336,13 +340,13 @@ public:
336 { 340 {
337 if(touch.GetState(0) == PointState::DOWN) 341 if(touch.GetState(0) == PointState::DOWN)
338 { 342 {
339 - const int local_x = static_cast<int>(touch.GetLocalPosition(0).x);  
340 - const int local_y = static_cast<int>(touch.GetLocalPosition(0).y);  
341 - const int global_x = static_cast<int>(touch.GetScreenPosition(0).x);  
342 - const int global_y = static_cast<int>(touch.GetScreenPosition(0).y); 343 + const int localX = static_cast<int>(touch.GetLocalPosition(0).x);
  344 + const int localY = static_cast<int>(touch.GetLocalPosition(0).y);
  345 + const int globalX = static_cast<int>(touch.GetScreenPosition(0).x);
  346 + const int globalY = static_cast<int>(touch.GetScreenPosition(0).y);
343 347
344 - DALI_LOG_RELEASE_INFO("SubWindow Touch Event : x:%d, y:%d\n", local_x, local_y);  
345 - DALI_LOG_RELEASE_INFO("global position: x:%d, y:%d\n", global_x, global_y); 348 + DALI_LOG_RELEASE_INFO("SubWindow Touch Event : x:%d, y:%d\n", localX, localY);
  349 + DALI_LOG_RELEASE_INFO("global position: x:%d, y:%d\n", globalX, globalY);
346 350
347 Dali::Window window = mSecondWindow; 351 Dali::Window window = mSecondWindow;
348 Window::WindowSize windowSize = window.GetSize(); 352 Window::WindowSize windowSize = window.GetSize();
@@ -350,44 +354,44 @@ public: @@ -350,44 +354,44 @@ public:
350 DALI_LOG_RELEASE_INFO("window size: w:%d, h:%d\n", windowSize.GetWidth(), windowSize.GetHeight()); 354 DALI_LOG_RELEASE_INFO("window size: w:%d, h:%d\n", windowSize.GetWidth(), windowSize.GetHeight());
351 DevelWindow::EnableFloatingMode(window, true); 355 DevelWindow::EnableFloatingMode(window, true);
352 356
353 - if((local_x < MARGIN) && (local_y < MARGIN)) // left top corner 357 + if((localX < MARGIN) && (localY < MARGIN)) // left top corner
354 { 358 {
355 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP_LEFT\n", local_x, local_y); 359 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP_LEFT\n", localX, localY);
356 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::TOP_LEFT); 360 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::TOP_LEFT);
357 } 361 }
358 - else if((local_x > (windowSize.GetWidth() - MARGIN)) && (local_y < MARGIN)) // rigth top corner 362 + else if((localX > (windowSize.GetWidth() - MARGIN)) && (localY < MARGIN)) // rigth top corner
359 { 363 {
360 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP_RIGHT\n", local_x, local_y); 364 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP_RIGHT\n", localX, localY);
361 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::TOP_RIGHT); 365 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::TOP_RIGHT);
362 } 366 }
363 - else if((local_x > MARGIN) && (local_x < (windowSize.GetWidth() - MARGIN)) && (local_y < MARGIN)) 367 + else if((localX > MARGIN) && (localX < (windowSize.GetWidth() - MARGIN)) && (localY < MARGIN))
364 { 368 {
365 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP\n", local_x, local_y); 369 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP\n", localX, localY);
366 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::TOP); 370 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::TOP);
367 } 371 }
368 - else if((local_x < MARGIN) && (local_y < (windowSize.GetHeight() - MARGIN)) && (local_y > MARGIN)) 372 + else if((localX < MARGIN) && (localY < (windowSize.GetHeight() - MARGIN)) && (localY > MARGIN))
369 { 373 {
370 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP\n", local_x, local_y); 374 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: TOP\n", localX, localY);
371 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::LEFT); 375 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::LEFT);
372 } 376 }
373 - else if((local_x > (windowSize.GetWidth() - MARGIN)) && (local_y < (windowSize.GetHeight() - MARGIN)) && (local_y > MARGIN)) 377 + else if((localX > (windowSize.GetWidth() - MARGIN)) && (localY < (windowSize.GetHeight() - MARGIN)) && (localY > MARGIN))
374 { 378 {
375 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: LEFT\n", local_x, local_y); 379 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: LEFT\n", localX, localY);
376 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::RIGHT); 380 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::RIGHT);
377 } 381 }
378 - else if((local_x < MARGIN) && (local_y > (windowSize.GetHeight() - MARGIN))) // left bottom corner 382 + else if((localX < MARGIN) && (localY > (windowSize.GetHeight() - MARGIN))) // left bottom corner
379 { 383 {
380 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: RIGHT\n", local_x, local_y); 384 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: RIGHT\n", localX, localY);
381 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::BOTTOM_LEFT); 385 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::BOTTOM_LEFT);
382 } 386 }
383 - else if((local_x > (windowSize.GetWidth() - MARGIN)) && (local_y > (windowSize.GetHeight() - MARGIN))) // right bottom corner 387 + else if((localX > (windowSize.GetWidth() - MARGIN)) && (localY > (windowSize.GetHeight() - MARGIN))) // right bottom corner
384 { 388 {
385 - DALI_LOG_RELEASE_INFO("RequestResizeToServer: BOTTOM_RIGHT\n", local_x, local_y); 389 + DALI_LOG_RELEASE_INFO("RequestResizeToServer: BOTTOM_RIGHT\n", localX, localY);
386 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::BOTTOM_RIGHT); 390 DevelWindow::RequestResizeToServer(window, WindowResizeDirection::BOTTOM_RIGHT);
387 } 391 }
388 else 392 else
389 { 393 {
390 - DALI_LOG_RELEASE_INFO("RequestMoveToServer\n", local_x, local_y); 394 + DALI_LOG_RELEASE_INFO("RequestMoveToServer\n", localX, localY);
391 DevelWindow::RequestMoveToServer(window); 395 DevelWindow::RequestMoveToServer(window);
392 } 396 }
393 } 397 }
@@ -413,15 +417,15 @@ public: @@ -413,15 +417,15 @@ public:
413 { 417 {
414 DALI_LOG_RELEASE_INFO("Present Callback Test\n"); 418 DALI_LOG_RELEASE_INFO("Present Callback Test\n");
415 419
416 - if(bColor == 0) 420 + if(!bColor)
417 { 421 {
418 window.SetBackgroundColor(Color::WHITE); 422 window.SetBackgroundColor(Color::WHITE);
419 - bColor = 1; 423 + bColor = true;
420 } 424 }
421 else 425 else
422 { 426 {
423 window.SetBackgroundColor(Color::BLACK); 427 window.SetBackgroundColor(Color::BLACK);
424 - bColor = 0; 428 + bColor = false;
425 } 429 }
426 430
427 DevelWindow::AddFramePresentedCallback(window, std::unique_ptr<Dali::CallbackBase>(MakeCallback(this, &WindowExampleController::PresentedCallback)), count); 431 DevelWindow::AddFramePresentedCallback(window, std::unique_ptr<Dali::CallbackBase>(MakeCallback(this, &WindowExampleController::PresentedCallback)), count);
@@ -429,14 +433,14 @@ public: @@ -429,14 +433,14 @@ public:
429 else if(event.GetKeyName() == "3") 433 else if(event.GetKeyName() == "3")
430 { 434 {
431 DALI_LOG_RELEASE_INFO("Send AckWindowRotation test\n"); 435 DALI_LOG_RELEASE_INFO("Send AckWindowRotation test\n");
432 - if(manual_rotation_flag == true) 436 + if(manualRotationFlag == true)
433 { 437 {
434 if(isRotating) 438 if(isRotating)
435 { 439 {
436 DALI_LOG_RELEASE_INFO("Send AckWindowRotation in Key Event Callback\n"); 440 DALI_LOG_RELEASE_INFO("Send AckWindowRotation in Key Event Callback\n");
437 DevelWindow::SendRotationCompletedAcknowledgement(window); 441 DevelWindow::SendRotationCompletedAcknowledgement(window);
438 - manual_rotation_flag = false;  
439 - isRotating = false; 442 + manualRotationFlag = false;
  443 + isRotating = false;
440 } 444 }
441 else 445 else
442 { 446 {
@@ -446,7 +450,7 @@ public: @@ -446,7 +450,7 @@ public:
446 else if(event.GetKeyName() == "4") 450 else if(event.GetKeyName() == "4")
447 { 451 {
448 DALI_LOG_RELEASE_INFO("Set Manual Window Rotation Test\n"); 452 DALI_LOG_RELEASE_INFO("Set Manual Window Rotation Test\n");
449 - if(manual_rotation_flag) 453 + if(manualRotationFlag)
450 { 454 {
451 mTimer.Start(); 455 mTimer.Start();
452 } 456 }
@@ -454,13 +458,13 @@ public: @@ -454,13 +458,13 @@ public:
454 { 458 {
455 mTimer.Stop(); 459 mTimer.Stop();
456 } 460 }
457 - DALI_LOG_RELEASE_INFO("call SetNeedsRotationCompletedAcknowledgement with flag %d\n", manual_rotation_flag);  
458 - DevelWindow::SetNeedsRotationCompletedAcknowledgement(window, manual_rotation_flag); 461 + DALI_LOG_RELEASE_INFO("call SetNeedsRotationCompletedAcknowledgement with flag %d\n", manualRotationFlag);
  462 + DevelWindow::SetNeedsRotationCompletedAcknowledgement(window, manualRotationFlag);
459 } 463 }
460 else 464 else
461 { 465 {
462 - DALI_LOG_RELEASE_INFO("set flag %d\n", manual_rotation_flag);  
463 - manual_rotation_flag = true; 466 + DALI_LOG_RELEASE_INFO("set flag %d\n", manualRotationFlag);
  467 + manualRotationFlag = true;
464 } 468 }
465 } 469 }
466 else if(event.GetKeyName() == "5") 470 else if(event.GetKeyName() == "5")
@@ -555,21 +559,21 @@ public: @@ -555,21 +559,21 @@ public:
555 559
556 private: 560 private:
557 Application& mApplication; 561 Application& mApplication;
558 - Control mClipControl;  
559 - bool manual_rotation_flag;  
560 - int rotation_count;  
561 - int rot;  
562 - Timer mTimer;  
563 - TextLabel mTextLabel2;  
564 - bool enableTimer;  
565 - bool bChangedOrientation;  
566 - bool isRotating;  
567 - bool bColor;  
568 -  
569 - Dali::Window mSecondWindow;  
570 - Dali::WindowOrientation currentOrientation;  
571 -  
572 - CallbackBase* mPresentCallback{}; 562 + Control mClipControl{};
  563 + bool manualRotationFlag{false};
  564 + int rotationCount{0};
  565 + int rot{0};
  566 + Timer mTimer{};
  567 + TextLabel mTextLabel2{};
  568 + bool enableTimer{false};
  569 + bool bChangedOrientation{false};
  570 + bool isRotating{false};
  571 + bool bColor{false};
  572 +
  573 + Dali::Window mSecondWindow{};
  574 + Dali::WindowOrientation currentOrientation{Dali::WindowOrientation::NO_ORIENTATION_PREFERENCE};
  575 +
  576 + CallbackBase* mPresentCallback{nullptr};
573 }; 577 };
574 578
575 int DALI_EXPORT_API main(int argc, char** argv) 579 int DALI_EXPORT_API main(int argc, char** argv)