/*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
#include <dali-toolkit/public-api/image-loader/image.h>
#include <dali-toolkit/public-api/image-loader/image-url.h>
#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
+#include <dali/integration-api/debug.h>
#include <functional>
#include <memory>
mMouseEventsEnabled(true),
mKeyEventsEnabled(true),
mScreenshotCapturedCallback{nullptr},
- mFrameRenderedCallback{nullptr}
+ mFrameRenderedCallback{nullptr},
+ mCornerRadius(Vector4::ZERO),
+ mCornerRadiusPolicy(1.0f)
{
mWebEngine = Dali::WebEngine::New();
mMouseEventsEnabled(true),
mKeyEventsEnabled(true),
mScreenshotCapturedCallback{nullptr},
- mFrameRenderedCallback{nullptr}
+ mFrameRenderedCallback{nullptr},
+ mCornerRadius(Vector4::ZERO),
+ mCornerRadiusPolicy(1.0f)
{
mWebEngine = Dali::WebEngine::New();
Actor self = Self();
self.SetProperty(Actor::Property::KEYBOARD_FOCUSABLE, true);
- self.SetProperty(DevelActor::Property::TOUCH_FOCUSABLE, true);
self.TouchedSignal().Connect(this, &WebView::OnTouchEvent);
self.HoveredSignal().Connect(this, &WebView::OnHoverEvent);
self.WheelEventSignal().Connect(this, &WebView::OnWheelEvent);
mSizeUpdateNotification.NotifySignal().Connect(this, &WebView::OnDisplayAreaUpdated);
mScaleUpdateNotification.NotifySignal().Connect(this, &WebView::OnDisplayAreaUpdated);
+ // Create WebVisual for WebView
+ Property::Map propertyMap;
+ propertyMap.Insert(Dali::Toolkit::Visual::Property::TYPE, Dali::Toolkit::Visual::COLOR);
+ propertyMap.Insert(Dali::Toolkit::Visual::Property::MIX_COLOR, Color::TRANSPARENT);
+ Toolkit::Visual::Base webVisual = Toolkit::VisualFactory::Get().CreateVisual(propertyMap);
+ if(webVisual)
+ {
+ Dali::Toolkit::DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, webVisual);
+ }
+ else
+ {
+ DALI_LOG_ERROR("fail to create webVisual for CornerRadius");
+ Dali::Toolkit::DevelControl::UnregisterVisual(*this, Toolkit::WebView::Property::URL);
+ }
+
if(mWebEngine)
{
mWebEngine.RegisterFrameRenderedCallback(std::bind(&WebView::OnFrameRendered, this));
return new WebViewAccessible(Self(), mWebEngine);
}
+void WebView::ChangeOrientation(int orientation)
+{
+ if(mWebEngine)
+ {
+ mWebEngine.ChangeOrientation(orientation);
+ }
+}
+
Dali::Toolkit::WebSettings* WebView::GetSettings() const
{
return mWebSettings.get();
return mWebEngine ? mWebEngine.CheckVideoPlayingAsynchronously(callback) : false;
}
+void WebView::ExitFullscreen()
+{
+ if(mWebEngine)
+ {
+ mWebEngine.ExitFullscreen();
+ }
+}
+
void WebView::RegisterGeolocationPermissionCallback(Dali::WebEnginePlugin::GeolocationPermissionCallback callback)
{
if(mWebEngine)
}
}
+void WebView::RegisterNewWindowPolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineNewWindowPolicyDecidedCallback callback)
+{
+ if(mWebEngine)
+ {
+ mWebEngine.RegisterNewWindowPolicyDecidedCallback(callback);
+ }
+}
+
void WebView::RegisterNewWindowCreatedCallback(Dali::WebEnginePlugin::WebEngineNewWindowCreatedCallback callback)
{
if(mWebEngine)
}
}
+void WebView::RegisterFullscreenEnteredCallback(Dali::WebEnginePlugin::WebEngineFullscreenEnteredCallback callback)
+{
+ if(mWebEngine)
+ {
+ mWebEngine.RegisterFullscreenEnteredCallback(callback);
+ }
+}
+
+void WebView::RegisterFullscreenExitedCallback(Dali::WebEnginePlugin::WebEngineFullscreenExitedCallback callback)
+{
+ if(mWebEngine)
+ {
+ mWebEngine.RegisterFullscreenExitedCallback(callback);
+ }
+}
+
+void WebView::RegisterTextFoundCallback(Dali::WebEnginePlugin::WebEngineTextFoundCallback callback)
+{
+ if(mWebEngine)
+ {
+ mWebEngine.RegisterTextFoundCallback(callback);
+ }
+}
+
void WebView::GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback)
{
if(mWebEngine)
if (mVisual)
return;
+ // Get webVisual for checking corner radius
+ Toolkit::Visual::Base webVisual = Dali::Toolkit::DevelControl::GetVisual(*this, Toolkit::WebView::Property::URL);
+ Property::Map webMap;
+ webVisual.CreatePropertyMap(webMap);
+ Property::Value* cornerRadiusValue = webMap.Find(Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS);
+ if(cornerRadiusValue)
+ {
+ mCornerRadius = cornerRadiusValue->Get<Vector4>();
+ }
+ Property::Value* cornerRadiusValuePolicy = webMap.Find(Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY);
+ if(cornerRadiusValuePolicy)
+ {
+ mCornerRadiusPolicy = cornerRadiusValuePolicy->Get<int>();
+ }
+
Dali::Toolkit::ImageUrl nativeImageUrl = Dali::Toolkit::Image::GenerateUrl(mWebEngine.GetNativeImageSource());
- mVisual = Toolkit::VisualFactory::Get().CreateVisual({{Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE}, {Toolkit::ImageVisual::Property::URL, nativeImageUrl.GetUrl()}});
+ Property::Map propertyMap;
+ propertyMap.Insert(Dali::Toolkit::Visual::Property::TYPE, Dali::Toolkit::Visual::IMAGE);
+ propertyMap.Insert(Dali::Toolkit::ImageVisual::Property::URL, nativeImageUrl.GetUrl());
+ propertyMap.Insert(Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS, mCornerRadius);
+ propertyMap.Insert(Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, mCornerRadiusPolicy);
+ mVisual = Toolkit::VisualFactory::Get().CreateVisual(propertyMap);
if(mVisual)
{
DevelControl::RegisterVisual(*this, Toolkit::WebView::Property::URL, mVisual);
}
}
-Dali::Accessibility::Attributes WebView::WebViewAccessible::GetAttributes() const
+void WebView::WebViewAccessible::UpdateAttributes(Dali::Accessibility::Attributes& attributes) const
{
- auto attributes = DevelControl::ControlAccessible::GetAttributes();
+ static const std::string childBusKey = "child_bus";
+
+ ControlAccessible::UpdateAttributes(attributes);
if(mRemoteChild.GetAddress())
{
- attributes.insert_or_assign("child_bus", mRemoteChild.GetAddress().GetBus());
+ attributes.insert_or_assign(childBusKey, mRemoteChild.GetAddress().GetBus());
+ }
+ else
+ {
+ attributes.erase(childBusKey);
}
-
- return attributes;
}
void WebView::WebViewAccessible::DoGetChildren(std::vector<Dali::Accessibility::Accessible*>& children)