X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fwayland%2Fwindow-impl-wl.cpp;h=9f2ef45f17af8ee36e920cbadee32bb050414cef;hb=e3835b131a0967f82800c17419baf56e31cdb32a;hp=da7a1c0c08e2fad9150286c28963bad5604d67fc;hpb=19f9d1e8f9f22d5c29fbce70f7a73ab766a7ed7a;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/adaptors/wayland/window-impl-wl.cpp b/adaptors/wayland/window-impl-wl.cpp index da7a1c0..9f2ef45 100644 --- a/adaptors/wayland/window-impl-wl.cpp +++ b/adaptors/wayland/window-impl-wl.cpp @@ -148,11 +148,6 @@ RenderSurface* Window::GetSurface() return mSurface; } -void Window::SetIndicatorStyle( Dali::Window::IndicatorStyle style ) -{ - mIndicatorStyle = style; -} - void Window::ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode ) { DALI_LOG_TRACE_METHOD_FMT( gWindowLogFilter, "visible : %d\n", visibleMode ); @@ -184,7 +179,6 @@ void Window::SetClass(std::string name, std::string klass) Window::Window() : mSurface(NULL), - mIndicatorStyle(Dali::Window::CHANGEABLE_COLOR), mIndicatorVisible(Dali::Window::VISIBLE), mIndicatorIsShown(false), mShowRotatedIndicatorOnClose(false), @@ -224,8 +218,11 @@ void Window::Initialize(const PositionSize& windowPosition, const std::string& n { // create an Wayland window by default Any surface; - Any display; - mSurface = new ECore::WindowRenderSurface( windowPosition, surface, display, name, mIsTransparent ); + ECore::WindowRenderSurface* windowSurface = new ECore::WindowRenderSurface( windowPosition, surface, name, mIsTransparent ); + windowSurface->Map(); + + mSurface = windowSurface; + mOrientation = Orientation::New(this); // create event handler for Wayland window @@ -238,7 +235,7 @@ void Window::DoShowIndicator( Dali::Window::WindowOrientation lastOrientation ) { if( mIndicatorVisible != Dali::Window::INVISIBLE ) { - mIndicator = new Indicator( mAdaptor, mIndicatorOrientation, mIndicatorStyle, this ); + mIndicator = new Indicator( mAdaptor, mIndicatorOrientation, this ); mIndicator->SetOpacityMode( mIndicatorOpacityMode ); Dali::Actor actor = mIndicator->GetActor(); SetIndicatorActorRotation(); @@ -411,11 +408,6 @@ void Window::OnDestroy() mAdaptor = NULL; } -OrientationPtr Window::GetOrientation() -{ - return mOrientation; -} - void Window::AddAvailableOrientation(Dali::Window::WindowOrientation orientation) { bool found = false;