Skip to content

fix(ohos): fix dimensions of window for pc #4448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2025
Merged

fix(ohos): fix dimensions of window for pc #4448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion framework/ohos/src/main/ets/hippy_framework/HippyEngineManagerImpl.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ export class HippyEngineManagerImpl implements HippyEngine, FrameworkProxy, DevS
if (!context) {
return;
}
let dimensionMap = await DimensionsUtil.getDimensions(-1, -1, context);
let dimensionMap = await DimensionsUtil.getDimensions(width, height, context);
let dimensionW: number = 0;
let dimensionH: number = 0;
if (dimensionMap) {
Expand Down
29 changes: 16 additions & 13 deletions framework/ohos/src/main/ets/support/utils/DimensionsUtil.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,23 @@ export class DimensionsUtil {
await DimensionsUtil.getStatusBarHeight(displayClass);
let dimensionMap = new Map<string, HippyValue | Map<string, HippyValue>>()

let windowRect = await DimensionsUtil.getLastWindowRect(context);
let w = 0;
let h = 0;
if (windowRect.width > 0 && windowRect.height > 0) {
w = windowRect.width;
h = windowRect.height;
} else {
w = displayClass.width;
h = displayClass.height;
let wwPixels = ww * displayClass.densityPixels;
let whPixels = wh * displayClass.densityPixels;

if (wwPixels < 0 || whPixels < 0) {
let windowRect = await DimensionsUtil.getLastWindowRect(context);
if (windowRect.width > 0 && windowRect.height > 0) {
wwPixels = windowRect.width;
whPixels = windowRect.height;
} else {
wwPixels = displayClass.width;
whPixels = displayClass.height;
}
}

let windowDisplayMetricsMap = new Map<string, HippyValue>()
windowDisplayMetricsMap.set("width", ww >= 0 ? ww : w);
windowDisplayMetricsMap.set("height", wh >= 0 ? wh : h);
windowDisplayMetricsMap.set("width", wwPixels);
windowDisplayMetricsMap.set("height", whPixels);
windowDisplayMetricsMap.set("scale", displayClass.densityPixels / PixelUtil.getDensityScale());
windowDisplayMetricsMap.set("fontScale", displayClass.scaledDensity / PixelUtil.getDensityScale());
windowDisplayMetricsMap.set("densityDpi", displayClass.densityDPI / PixelUtil.getDensityScale());
Expand All @@ -65,8 +68,8 @@ export class DimensionsUtil {
dimensionMap.set("windowPhysicalPixels", windowDisplayMetricsMap);

let screenDisplayMetricsMap = new Map<string, HippyValue>()
screenDisplayMetricsMap.set("width", w);
screenDisplayMetricsMap.set("height", h);
screenDisplayMetricsMap.set("width", displayClass.width);
screenDisplayMetricsMap.set("height", displayClass.height);
screenDisplayMetricsMap.set("scale", displayClass.densityPixels / PixelUtil.getDensityScale());
screenDisplayMetricsMap.set("fontScale", displayClass.scaledDensity / PixelUtil.getDensityScale());
screenDisplayMetricsMap.set("densityDpi", displayClass.densityDPI / PixelUtil.getDensityScale());
Expand Down
Loading