From c49f7d821f08ddfb1b628ba7ce109f1c4fa6f3c2 Mon Sep 17 00:00:00 2001 From: DevWiki Date: Fri, 19 Apr 2024 14:11:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84?= =?UTF-8?q?=E5=B5=8C=E5=A5=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common_ui/src/main/ets/component/TitleBar.ets | 144 +++++++++--------- 1 file changed, 71 insertions(+), 73 deletions(-) diff --git a/common_ui/src/main/ets/component/TitleBar.ets b/common_ui/src/main/ets/component/TitleBar.ets index bd185c8..0c2756a 100644 --- a/common_ui/src/main/ets/component/TitleBar.ets +++ b/common_ui/src/main/ets/component/TitleBar.ets @@ -43,81 +43,79 @@ export struct TitleBar { } build() { - Row() { - RelativeContainer() { - if (this.leftMenuType != TitleBarMenuType.None) { - Button() { - if (this.leftMenuType == TitleBarMenuType.Icon) { - Image(this.leftIcon) - .setWidthAndHeight() - .padding(this.menuPadding) - } else { - Text(this.leftText) - .textAlign(TextAlign.Center) - .setWidthAndHeight() - } + RelativeContainer() { + if (this.leftMenuType != TitleBarMenuType.None) { + Button() { + if (this.leftMenuType == TitleBarMenuType.Icon) { + Image(this.leftIcon) + .setWidthAndHeight() + .padding(this.menuPadding) + } else { + Text(this.leftText) + .textAlign(TextAlign.Center) + .setWidthAndHeight() } - .setWidthAndHeight() - .backgroundColor(0xFFFFFF) - .type(ButtonType.Normal) - .stateEffect(true) - .onClick((event) => { - this.onLeftClicked?.(event); - }) - .alignRules({ - top: { anchor: ComponentConst.ContainerId, align: VerticalAlign.Top }, - left: { anchor: ComponentConst.ContainerId, align: HorizontalAlign.Start }, - }).id("left_menu") - } - - if (this.titleVisible == Visibility.Visible) { - Text(this.title) - .textAlign(this.titleTextAlign) - .backgroundColor(0xFFFFFF) - .padding({ - left: this.leftMenuType != TitleBarMenuType.None ? 0 : this.menuPadding, - right: this.rightMenuType != TitleBarMenuType.None ? 0 : this.menuPadding - }) - .alignRules({ - top: { anchor: ComponentConst.ContainerId, align: VerticalAlign.Top }, - left: { - anchor: this.leftMenuType != TitleBarMenuType.None ? "left_menu" : ComponentConst.ContainerId, - align: this.leftMenuType != TitleBarMenuType.None ? HorizontalAlign.End : HorizontalAlign.Start - }, - right: { - anchor: this.rightMenuType != TitleBarMenuType.None ? "right_menu" : ComponentConst.ContainerId, - align: this.rightMenuType != TitleBarMenuType.None ? HorizontalAlign.Start : HorizontalAlign.End - }, - bottom: { anchor: ComponentConst.ContainerId, align: VerticalAlign.Bottom } - }) - .id("title") - } - - if (this.rightMenuType != TitleBarMenuType.None) { - Button() { - if (this.rightMenuType == TitleBarMenuType.Icon) { - Image(this.rightIcon) - .setWidthAndHeight().padding(this.menuPadding) - } else { - Text(this.rightText) - .textAlign(TextAlign.Center) - .setWidthAndHeight() - } - } - .setWidthAndHeight() - .backgroundColor(0xFFFFFF) - .type(ButtonType.Normal) - .stateEffect(true) - .onClick((event) => { - this.onRightClicked?.(event); - }) - .alignRules({ - top: { anchor: ComponentConst.ContainerId, align: VerticalAlign.Top }, - right: { anchor: ComponentConst.ContainerId, align: HorizontalAlign.End }, - }).id("right_menu") } + .setWidthAndHeight() + .backgroundColor(0xFFFFFF) + .type(ButtonType.Normal) + .stateEffect(true) + .onClick((event) => { + this.onLeftClicked?.(event); + }) + .alignRules({ + top: { anchor: ComponentConst.ContainerId, align: VerticalAlign.Top }, + left: { anchor: ComponentConst.ContainerId, align: HorizontalAlign.Start }, + }).id("left_menu") } - .width('100%').height('100%') - }.height(this.barHeight) + + if (this.titleVisible == Visibility.Visible) { + Text(this.title) + .textAlign(this.titleTextAlign) + .backgroundColor(0xFFFFFF) + .padding({ + left: this.leftMenuType != TitleBarMenuType.None ? 0 : this.menuPadding, + right: this.rightMenuType != TitleBarMenuType.None ? 0 : this.menuPadding + }) + .alignRules({ + top: { anchor: ComponentConst.ContainerId, align: VerticalAlign.Top }, + left: { + anchor: this.leftMenuType != TitleBarMenuType.None ? "left_menu" : ComponentConst.ContainerId, + align: this.leftMenuType != TitleBarMenuType.None ? HorizontalAlign.End : HorizontalAlign.Start + }, + right: { + anchor: this.rightMenuType != TitleBarMenuType.None ? "right_menu" : ComponentConst.ContainerId, + align: this.rightMenuType != TitleBarMenuType.None ? HorizontalAlign.Start : HorizontalAlign.End + }, + bottom: { anchor: ComponentConst.ContainerId, align: VerticalAlign.Bottom } + }) + .id("title") + } + + if (this.rightMenuType != TitleBarMenuType.None) { + Button() { + if (this.rightMenuType == TitleBarMenuType.Icon) { + Image(this.rightIcon) + .setWidthAndHeight().padding(this.menuPadding) + } else { + Text(this.rightText) + .textAlign(TextAlign.Center) + .setWidthAndHeight() + } + } + .setWidthAndHeight() + .backgroundColor(0xFFFFFF) + .type(ButtonType.Normal) + .stateEffect(true) + .onClick((event) => { + this.onRightClicked?.(event); + }) + .alignRules({ + top: { anchor: ComponentConst.ContainerId, align: VerticalAlign.Top }, + right: { anchor: ComponentConst.ContainerId, align: HorizontalAlign.End }, + }).id("right_menu") + } + } + .width('100%').height('100%').height(this.barHeight) } } \ No newline at end of file