From b4ccc51cebd258d77a90822f76d943fbcd165231 Mon Sep 17 00:00:00 2001 From: Knight4Lancelot <320062713@qq.com> Date: Wed, 26 Feb 2025 21:11:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3ASNavigation=E7=9A=84titl?= =?UTF-8?q?e=E4=B8=8Emenubar=E9=81=BF=E8=AE=A9=E5=AE=BD=E5=BA=A6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Knight4Lancelot <320062713@qq.com> --- atomicservicenavigation/interfaces/atomicservicenavigation.js | 2 +- atomicservicenavigation/source/atomicservicenavigation.ets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atomicservicenavigation/interfaces/atomicservicenavigation.js b/atomicservicenavigation/interfaces/atomicservicenavigation.js index 66d02a0..b974e47 100644 --- a/atomicservicenavigation/interfaces/atomicservicenavigation.js +++ b/atomicservicenavigation/interfaces/atomicservicenavigation.js @@ -146,7 +146,7 @@ export class AtomicServiceNavigation extends ViewPU { this.__currentBreakPoint = new ObservedPropertySimplePU(BREAK_POINT_SM, this, 'currentBreakPoint'); this.__sideBarAttribute = new ObservedPropertyObjectPU(new sideBarAttributeSet(), this, 'sideBarAttribute'); this.__controlButtonVisible = new ObservedPropertySimplePU(true, this, 'controlButtonVisible'); - this.__titleBuilderPaddingEndWidth = new ObservedPropertySimplePU(0, this, 'titleBuilderPaddingEndWidth'); + this.__titleBuilderPaddingEndWidth = new ObservedPropertySimplePU(97.5, this, 'titleBuilderPaddingEndWidth'); this.menus = undefined; this.stateChangeCallback = undefined; this.modeChangeCallback = undefined; diff --git a/atomicservicenavigation/source/atomicservicenavigation.ets b/atomicservicenavigation/source/atomicservicenavigation.ets index b82f2d3..16a3df2 100644 --- a/atomicservicenavigation/source/atomicservicenavigation.ets +++ b/atomicservicenavigation/source/atomicservicenavigation.ets @@ -141,7 +141,7 @@ export struct AtomicServiceNavigation { @State private currentBreakPoint: string = BREAK_POINT_SM; @State private sideBarAttribute: sideBarAttributeSet = new sideBarAttributeSet(); @State private controlButtonVisible: boolean = true; - @State private titleBuilderPaddingEndWidth: number = 0; + @State private titleBuilderPaddingEndWidth: number = 97.5; @BuilderParam menus?: CustomBuilder | Array; stateChangeCallback?: Callback; modeChangeCallback?: Callback; -- Gitee From d575780a736dc84e192618f4dd346dbae875166b Mon Sep 17 00:00:00 2001 From: Knight4Lancelot <320062713@qq.com> Date: Thu, 27 Feb 2025 20:11:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3ASNavigation=E7=9A=84titl?= =?UTF-8?q?e=E4=B8=8Emenubar=E9=81=BF=E8=AE=A9=E5=AE=BD=E5=BA=A6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Knight4Lancelot --- .../interfaces/atomicservicenavigation.js | 9 +++++++-- .../source/atomicservicenavigation.ets | 11 ++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/atomicservicenavigation/interfaces/atomicservicenavigation.js b/atomicservicenavigation/interfaces/atomicservicenavigation.js index b974e47..be613f9 100644 --- a/atomicservicenavigation/interfaces/atomicservicenavigation.js +++ b/atomicservicenavigation/interfaces/atomicservicenavigation.js @@ -462,7 +462,12 @@ export class AtomicServiceNavigation extends ViewPU { */ freshMenubarAvoidAreaWidth(mainWindow) { setTimeout(() => { - let menubarX = this.getUIContext().getAtomicServiceBar()?.getBarRect().x; + const AtomicServiceBar = this.getUIContext().getAtomicServiceBar(); + if (!AtomicServiceBar) { + this.titleBuilderPaddingEndWidth = 0; + return; + } + let menubarX = AtomicServiceBar.getBarRect().x; let corretionWidth = 0; if (menubarX > MENUBAR_X_FIRST_THRESHOLD) { const mainWindowWidth = px2vp(mainWindow.getWindowProperties()?.windowRect?.width) - menubarX; @@ -471,7 +476,7 @@ export class AtomicServiceNavigation extends ViewPU { else if (menubarX < MENUBAR_X_SECOND_THRESHOLD) { corretionWidth = menubarX + MENUBAR_CORRECTION_OFFSET_VALUE; } - let width2 = this.getUIContext().getAtomicServiceBar()?.getBarRect().width; + let width2 = AtomicServiceBar.getBarRect().width; this.titleBuilderPaddingEndWidth = corretionWidth > width2 ? corretionWidth : width2; }, 100); } diff --git a/atomicservicenavigation/source/atomicservicenavigation.ets b/atomicservicenavigation/source/atomicservicenavigation.ets index 16a3df2..13e297f 100644 --- a/atomicservicenavigation/source/atomicservicenavigation.ets +++ b/atomicservicenavigation/source/atomicservicenavigation.ets @@ -14,7 +14,7 @@ */ import { BusinessError, Callback } from '@ohos.base'; -import { curves, LengthMetrics, SymbolGlyphModifier, window } from '@kit.ArkUI'; +import { curves, LengthMetrics, SymbolGlyphModifier, window, AtomicServiceBar } from '@kit.ArkUI'; import { bundleManager, common } from '@kit.AbilityKit'; import { hilog } from '@kit.PerformanceAnalysisKit'; import { i18n } from '@kit.LocalizationKit'; @@ -227,7 +227,12 @@ export struct AtomicServiceNavigation { */ private freshMenubarAvoidAreaWidth(mainWindow: window.Window): void { setTimeout(() => { - let menubarX: number = this.getUIContext().getAtomicServiceBar()?.getBarRect().x; + const AtomicServiceBar: Nullable = this.getUIContext().getAtomicServiceBar(); + if (!AtomicServiceBar) { + this.titleBuilderPaddingEndWidth = 0; + return; + } + let menubarX: number = AtomicServiceBar.getBarRect().x; let corretionWidth: number = 0; if (menubarX > MENUBAR_X_FIRST_THRESHOLD) { const mainWindowWidth: number = px2vp(mainWindow.getWindowProperties()?.windowRect?.width) - menubarX; @@ -235,7 +240,7 @@ export struct AtomicServiceNavigation { } else if (menubarX < MENUBAR_X_SECOND_THRESHOLD) { corretionWidth = menubarX + MENUBAR_CORRECTION_OFFSET_VALUE; } - let width2: number = this.getUIContext().getAtomicServiceBar()?.getBarRect().width; + let width2: number = AtomicServiceBar.getBarRect().width; this.titleBuilderPaddingEndWidth = corretionWidth > width2 ? corretionWidth : width2; }, 100); } -- Gitee From 2be68a8a3bb46c15cada5032985323d701d66624 Mon Sep 17 00:00:00 2001 From: Knight4Lancelot <320062713@qq.com> Date: Thu, 27 Feb 2025 20:14:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3ASNavigation=E7=9A=84titl?= =?UTF-8?q?e=E4=B8=8Emenubar=E9=81=BF=E8=AE=A9=E5=AE=BD=E5=BA=A6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Knight4Lancelot --- atomicservicenavigation/interfaces/atomicservicenavigation.js | 2 +- atomicservicenavigation/source/atomicservicenavigation.ets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atomicservicenavigation/interfaces/atomicservicenavigation.js b/atomicservicenavigation/interfaces/atomicservicenavigation.js index be613f9..421689b 100644 --- a/atomicservicenavigation/interfaces/atomicservicenavigation.js +++ b/atomicservicenavigation/interfaces/atomicservicenavigation.js @@ -146,7 +146,7 @@ export class AtomicServiceNavigation extends ViewPU { this.__currentBreakPoint = new ObservedPropertySimplePU(BREAK_POINT_SM, this, 'currentBreakPoint'); this.__sideBarAttribute = new ObservedPropertyObjectPU(new sideBarAttributeSet(), this, 'sideBarAttribute'); this.__controlButtonVisible = new ObservedPropertySimplePU(true, this, 'controlButtonVisible'); - this.__titleBuilderPaddingEndWidth = new ObservedPropertySimplePU(97.5, this, 'titleBuilderPaddingEndWidth'); + this.__titleBuilderPaddingEndWidth = new ObservedPropertySimplePU(0, this, 'titleBuilderPaddingEndWidth'); this.menus = undefined; this.stateChangeCallback = undefined; this.modeChangeCallback = undefined; diff --git a/atomicservicenavigation/source/atomicservicenavigation.ets b/atomicservicenavigation/source/atomicservicenavigation.ets index 13e297f..88660bc 100644 --- a/atomicservicenavigation/source/atomicservicenavigation.ets +++ b/atomicservicenavigation/source/atomicservicenavigation.ets @@ -141,7 +141,7 @@ export struct AtomicServiceNavigation { @State private currentBreakPoint: string = BREAK_POINT_SM; @State private sideBarAttribute: sideBarAttributeSet = new sideBarAttributeSet(); @State private controlButtonVisible: boolean = true; - @State private titleBuilderPaddingEndWidth: number = 97.5; + @State private titleBuilderPaddingEndWidth: number = 0; @BuilderParam menus?: CustomBuilder | Array; stateChangeCallback?: Callback; modeChangeCallback?: Callback; -- Gitee