projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Partial update) Fix surface damage area
[platform/core/uifw/dali-adaptor.git]
/
dali
/
devel-api
/
adaptor-framework
/
window-devel.cpp
diff --git
a/dali/devel-api/adaptor-framework/window-devel.cpp
b/dali/devel-api/adaptor-framework/window-devel.cpp
old mode 100755
(executable)
new mode 100644
(file)
index
7d046ec
..
f883ae8
--- a/
dali/devel-api/adaptor-framework/window-devel.cpp
+++ b/
dali/devel-api/adaptor-framework/window-devel.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-17,7
+17,6
@@
// EXTERNAL INCLUDES
#include <dali/public-api/events/key-event.h>
// EXTERNAL INCLUDES
#include <dali/public-api/events/key-event.h>
-#include <dali/public-api/events/touch-event.h>
#include <dali/public-api/events/wheel-event.h>
// INTERNAL INCLUDES
#include <dali/public-api/events/wheel-event.h>
// INTERNAL INCLUDES
@@
-56,7
+55,7
@@
Window New(Any surface, PositionSize windowPosition, const std::string& name, co
if (isAdaptorAvailable)
{
Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get();
if (isAdaptorAvailable)
{
Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get();
- Internal::Adaptor::Adaptor::GetImplementation(adaptor).AddWindow(sceneHolder
, name, className, isTransparent
);
+ Internal::Adaptor::Adaptor::GetImplementation(adaptor).AddWindow(sceneHolder);
}
newWindow = Window(window);
}
}
newWindow = Window(window);
}
@@
-73,11
+72,6
@@
void SetPositionSize( Window window, PositionSize positionSize )
GetImplementation( window ).SetPositionSize( positionSize );
}
GetImplementation( window ).SetPositionSize( positionSize );
}
-Dali::RenderTaskList GetRenderTaskList( Window window )
-{
- return GetImplementation( window ).GetRenderTaskList();
-}
-
Window Get( Actor actor )
{
return Internal::Adaptor::Window::Get( actor );
Window Get( Actor actor )
{
return Internal::Adaptor::Window::Get( actor );
@@
-88,16
+82,6
@@
EventProcessingFinishedSignalType& EventProcessingFinishedSignal( Window window
return GetImplementation( window ).EventProcessingFinishedSignal();
}
return GetImplementation( window ).EventProcessingFinishedSignal();
}
-KeyEventSignalType& KeyEventSignal( Window window )
-{
- return GetImplementation( window ).KeyEventSignal();
-}
-
-TouchSignalType& TouchSignal( Window window )
-{
- return GetImplementation( window ).TouchSignal();
-}
-
WheelEventSignalType& WheelEventSignal( Window window )
{
return GetImplementation( window ).WheelEventSignal();
WheelEventSignalType& WheelEventSignal( Window window )
{
return GetImplementation( window ).WheelEventSignal();
@@
-113,6
+97,11
@@
TransitionEffectEventSignalType& TransitionEffectEventSignal( Window window )
return GetImplementation( window ).TransitionEffectEventSignal();
}
return GetImplementation( window ).TransitionEffectEventSignal();
}
+KeyboardRepeatSettingsChangedSignalType& KeyboardRepeatSettingsChangedSignal( Window window )
+{
+ return GetImplementation( window ).KeyboardRepeatSettingsChangedSignal();
+}
+
void SetParent( Window window, Window parent )
{
GetImplementation( window ).SetParent( parent );
void SetParent( Window window, Window parent )
{
GetImplementation( window ).SetParent( parent );
@@
-148,11
+137,6
@@
int32_t GetNativeId( Window window )
return GetImplementation( window ).GetNativeId();
}
return GetImplementation( window ).GetNativeId();
}
-void SetDamagedAreas(Window window, std::vector<Dali::Rect<int>>& areas)
-{
- GetImplementation(window).SetDamagedAreas(areas);
-}
-
void AddFrameRenderedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId )
{
GetImplementation( window ).AddFrameRenderedCallback( std::move( callback ), frameId );
void AddFrameRenderedCallback( Window window, std::unique_ptr< CallbackBase > callback, int32_t frameId )
{
GetImplementation( window ).AddFrameRenderedCallback( std::move( callback ), frameId );