openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-20 20:20:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

js interface: support wide gamut for window

Browse Source 
Change-Id: I5c5687b51133967531c70069db3c09ffd3a5b3bf
Signed-off-by: fanby01 <yaojian7@huawei.com>
This commit is contained in:
fanby01
2022-02-09 17:23:45 +08:00
parent 7601155dd8
commit 24099caaa2
3 changed files with 178 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/kits/napi/window_runtime/api/@ohos.window.d.ts
Vendored
+53
View File
@@ -432,6 +432,21 @@ declare namespace window {
isFullScreen: boolean
}
/**
* Type of allowing the specified of color space.
* @since 8
*/
enum ColorSpace {
/**
* Default color space.
*/
DEFAULT,
/**
* Wide gamut color space. The specific wide color gamut depends on thr screen.
*/
WIDE_GAMUT,
}
interface Window {
/**
* hide sub window.
@@ -671,6 +686,44 @@ declare namespace window {
* @since 7
*/
off(type: 'systemAvoidAreaChange', callback?: Callback<AvoidArea>): void;
/**
* Whether the window supports thr wide gamut setting.
* @since 8
*/
isSupportWideGamut(): Promise<boolean>;
/**
* Whether the window supports thr wide gamut setting.
* @since 8
*/
isSupportWideGamut(callback: AsyncCallback<boolean>): void;
/**
* Sets the specified color space.
* @param colorSpace the specified color space.
* @since 8
*/
setColorSpace(colorSpace:ColorSpace): Promise<void>;
/**
* Sets the specified color space.
* @param colorSpace the specified color space.
* @since 8
*/
setColorSpace(colorSpace:ColorSpace, callback: AsyncCallback<void>): void;
/**
* Obtains thr set color space.
* @since 8
*/
getColorSpace(): Promise<ColorSpace>;
/**
* Obtains thr set color space.
* @since 8
*/
getColorSpace(callback: AsyncCallback<ColorSpace>): void;
}
enum WindowStageEventType {
interfaces/kits/napi/window_runtime/window_napi/js_window.cpp
+114
View File
@@ -176,6 +176,27 @@ NativeValue* JsWindow::IsShowing(NativeEngine* engine, NativeCallbackInfo* info)
return (me != nullptr) ? me->OnIsShowing(*engine, *info) : nullptr;
}
NativeValue* JsWindow::IsSupportWideGamut(NativeEngine* engine, NativeCallbackInfo* info)
{
WLOGFI("JsWindow::IsSupportWideGamut is called");
JsWindow* me = CheckParamsAndGetThis<JsWindow>(engine, info);
return (me != nullptr) ? me->OnIsSupportWideGamut(*engine, *info) : nullptr;
}
NativeValue* JsWindow::SetColorSpace(NativeEngine* engine, NativeCallbackInfo* info)
{
WLOGFI("JsWindow::SetColorSpace is called");
JsWindow* me = CheckParamsAndGetThis<JsWindow>(engine, info);
return (me != nullptr) ? me->OnSetColorSpace(*engine, *info) : nullptr;
}
NativeValue* JsWindow::GetColorSpace(NativeEngine* engine, NativeCallbackInfo* info)
{
WLOGFI("JsWindow::GetColorSpace is called");
JsWindow* me = CheckParamsAndGetThis<JsWindow>(engine, info);
return (me != nullptr) ? me->OnGetColorSpace(*engine, *info) : nullptr;
}
NativeValue* JsWindow::OnShow(NativeEngine& engine, NativeCallbackInfo& info)
{
WLOGFI("JsWindow::OnShow is called");
@@ -909,6 +930,96 @@ NativeValue* JsWindow::OnIsShowing(NativeEngine& engine, NativeCallbackInfo& inf
return result;
}
NativeValue* JsWindow::OnIsSupportWideGamut(NativeEngine& engine, NativeCallbackInfo& info)
{
WLOGFI("JsWindow::OnIsSupportWideGamut is called");
AsyncTask::CompleteCallback complete =
[=](NativeEngine& engine, AsyncTask& task, int32_t status) {
if (windowToken_ == nullptr) {
task.Reject(engine, CreateJsError(engine, static_cast<int32_t>(WMError::WM_ERROR_NULLPTR),
"JsWindow::OnIsSupportWideGamut failed."));
WLOGFE("JsWindow windowToken_ is nullptr");
return;
}
bool flag = windowToken_->IsSupportWideGamut();
task.Resolve(engine, CreateJsValue(engine, flag));
};
NativeValue* lastParam = (info.argc == 0) ? nullptr :
(info.argv[0]->TypeOf() == NATIVE_FUNCTION ? info.argv[0] : nullptr);
NativeValue* result = nullptr;
AsyncTask::Schedule(
engine, CreateAsyncTaskWithLastParam(engine, lastParam, nullptr, std::move(complete), &result));
return result;
}
NativeValue* JsWindow::OnSetColorSpace(NativeEngine& engine, NativeCallbackInfo& info)
{
WLOGFI("JsWindow::OnSetColorSpace is called");
WMError errCode = WMError::WM_OK;
ColorSpace colorSpace = ColorSpace::COLOR_SPACE_DEFAULT;
if (windowToken_ == nullptr) {
WLOGFE("JsWindow windowToken_ is nullptr");
errCode = WMError::WM_ERROR_INVALID_PARAM;
}
if (info.argc < 1) {
errCode = WMError::WM_ERROR_INVALID_PARAM;
WLOGFE("JsWindow::OnSetColorSpace argc < 1");
} else {
NativeNumber* nativeType = ConvertNativeValueTo<NativeNumber>(info.argv[0]);
if (nativeType == nullptr) {
errCode = WMError::WM_ERROR_INVALID_PARAM;
WLOGFE("JsWindow::OnSetColorSpace Failed to convert parameter to ColorSpace");
} else {
colorSpace = static_cast<ColorSpace>(static_cast<uint32_t>(*nativeType));
WLOGFI("JsWindow::OnSetColorSpace %{public}u", static_cast<uint32_t>(colorSpace));
}
}
AsyncTask::CompleteCallback complete =
[=](NativeEngine& engine, AsyncTask& task, int32_t status) {
if (windowToken_ == nullptr || errCode != WMError::WM_OK) {
task.Reject(engine, CreateJsError(engine, static_cast<int32_t>(WMError::WM_ERROR_NULLPTR),
"JsWindow::OnSetColorSpace failed."));
WLOGFE("JsWindow windowToken_ is nullptr or args error");
return;
}
windowToken_->SetColorSpace(colorSpace);
task.Resolve(engine, CreateJsValue(engine, engine.CreateUndefined()));
};
NativeValue* lastParam = (info.argc <= ARGC_ONE) ? nullptr :
(info.argv[INDEX_ONE]->TypeOf() == NATIVE_FUNCTION ? info.argv[INDEX_ONE] : nullptr);
NativeValue* result = nullptr;
AsyncTask::Schedule(
engine, CreateAsyncTaskWithLastParam(engine, lastParam, nullptr, std::move(complete), &result));
return result;
}
NativeValue* JsWindow::OnGetColorSpace(NativeEngine& engine, NativeCallbackInfo& info)
{
WLOGFI("JsWindow::OnGetColorSpace is called");
AsyncTask::CompleteCallback complete =
[=](NativeEngine& engine, AsyncTask& task, int32_t status) {
if (windowToken_ == nullptr) {
task.Reject(engine, CreateJsError(engine, static_cast<int32_t>(WMError::WM_ERROR_NULLPTR),
"JsWindow::OnGetColorSpace failed."));
WLOGFE("JsWindow windowToken_ is nullptr");
return;
}
ColorSpace colorSpace = windowToken_->GetColorSpace();
task.Resolve(engine, CreateJsValue(engine, static_cast<uint32_t>(colorSpace)));
};
NativeValue* lastParam = (info.argc == 0) ? nullptr :
(info.argv[0]->TypeOf() == NATIVE_FUNCTION ? info.argv[0] : nullptr);
NativeValue* result = nullptr;
AsyncTask::Schedule(
engine, CreateAsyncTaskWithLastParam(engine, lastParam, nullptr, std::move(complete), &result));
return result;
}
std::shared_ptr<NativeReference> FindJsWindowObject(std::string windowName)
{
WLOGFI("JsWindow::FindJsWindowObject is called");
@@ -952,6 +1063,9 @@ NativeValue* CreateJsWindowObject(NativeEngine& engine, sptr<Window>& window)
BindNativeFunction(engine, *object, "setSystemBarProperties", JsWindow::SetSystemBarProperties);
BindNativeFunction(engine, *object, "getAvoidArea", JsWindow::GetAvoidArea);
BindNativeFunction(engine, *object, "isShowing", JsWindow::IsShowing);
BindNativeFunction(engine, *object, "isSupportWideGamut", JsWindow::IsSupportWideGamut);
BindNativeFunction(engine, *object, "setColorSpace", JsWindow::SetColorSpace);
BindNativeFunction(engine, *object, "getColorSpace", JsWindow::GetColorSpace);
std::shared_ptr<NativeReference> jsWindowRef;
jsWindowRef.reset(engine.CreateReference(objValue, 1));
std::lock_guard<std::recursive_mutex> lock(g_mutex);
interfaces/kits/napi/window_runtime/window_napi/js_window.h
+11
View File
@@ -50,6 +50,11 @@ public:
static NativeValue* GetAvoidArea(NativeEngine* engine, NativeCallbackInfo* info);
static NativeValue* IsShowing(NativeEngine* engine, NativeCallbackInfo* info);
// colorspace, gamut
static NativeValue* IsSupportWideGamut(NativeEngine* engine, NativeCallbackInfo* info);
static NativeValue* SetColorSpace(NativeEngine* engine, NativeCallbackInfo* info);
static NativeValue* GetColorSpace(NativeEngine* engine, NativeCallbackInfo* info);
private:
bool IfCallbackRegistered(std::string type, NativeValue* jsListenerObject);
void RegisterWindowListenerWithType(NativeEngine& engine, std::string type, NativeValue* value);
@@ -73,6 +78,12 @@ private:
NativeValue* OnLoadContent(NativeEngine& engine, NativeCallbackInfo& info);
NativeValue* OnGetAvoidArea(NativeEngine& engine, NativeCallbackInfo& info);
NativeValue* OnIsShowing(NativeEngine& engine, NativeCallbackInfo& info);
// colorspace, gamut
NativeValue* OnIsSupportWideGamut(NativeEngine& engine, NativeCallbackInfo& info);
NativeValue* OnSetColorSpace(NativeEngine& engine, NativeCallbackInfo& info);
NativeValue* OnGetColorSpace(NativeEngine& engine, NativeCallbackInfo& info);
sptr<Window> windowToken_ = nullptr;
std::map<std::string, std::vector<std::unique_ptr<NativeReference>>> jsCallbackMap_;
std::map<std::string, sptr<JsWindowListener>> jsListenerMap_;