Skip to content

fix: 修复自定义按键字色不生效 #23

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
qiin2333 merged 1 commit into from
May 6, 2026
+28 −30
Merged

fix: 修复自定义按键字色不生效 #23

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
56 changes: 27 additions & 29 deletions entry/src/main/ets/components/CustomKeyBtn.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ import {
getButtonIconResource,
} from './CustomKeyConstants';

function resolveCustomKeyForegroundColor(isActive: boolean, textColor: string): ResourceColor {
return isActive ? OV_TEXT_WHITE : textColor;
}

@Component
export struct CustomKeyBtn {
// ── 配置属性 ──
Expand Down Expand Up @@ -80,27 +84,33 @@ export struct CustomKeyBtn {
return this.keyDef.icon ? getButtonIconResource(this.keyDef.icon) : undefined;
}

/** 按下/切换态的前景色 */
private get fgColor(): ResourceColor {
return this.isPressed || this.isToggled ? OV_TEXT_WHITE : this.keyDef.textColor;
private getForegroundColor(): ResourceColor {
return resolveCustomKeyForegroundColor(
this.isPressed || this.isToggled,
this.keyDef.textColor);
}

@Builder
KeyFace() {
if (this.getIconRes()) {
Image(this.getIconRes()!)
.width(this.keyDef.fontSize + 6)
.height(this.keyDef.fontSize + 6)
.fillColor(this.getForegroundColor())
.objectFit(ImageFit.Contain)
} else {
Text(this.keyDef.label)
.fontSize(this.keyDef.fontSize)
.fontColor(this.getForegroundColor())
.fontWeight(FontWeight.Bold)
.textAlign(TextAlign.Center)
}
}

@Builder
NormalBtn() {
Stack() {
if (this.getIconRes()) {
Image(this.getIconRes()!)
.width(this.keyDef.fontSize + 6)
.height(this.keyDef.fontSize + 6)
.fillColor(this.fgColor)
.objectFit(ImageFit.Contain)
} else {
Text(this.keyDef.label)
.fontSize(this.keyDef.fontSize)
.fontColor(this.fgColor)
.fontWeight(FontWeight.Bold)
.textAlign(TextAlign.Center)
}
this.KeyFace()
}
.width(this.keyDef.width)
.height(this.keyDef.height)
Expand Down Expand Up @@ -159,19 +169,7 @@ export struct CustomKeyBtn {
.height(this.keyDef.height)

// 标签/图标
if (this.getIconRes()) {
Image(this.getIconRes()!)
.width(this.keyDef.fontSize + 6)
.height(this.keyDef.fontSize + 6)
.fillColor(this.fgColor)
.objectFit(ImageFit.Contain)
} else {
Text(this.keyDef.label)
.fontSize(this.keyDef.fontSize)
.fontColor(this.fgColor)
.fontWeight(FontWeight.Bold)
.textAlign(TextAlign.Center)
}
this.KeyFace()
}
.width(this.keyDef.width)
.height(this.keyDef.height)
Expand Down
2 changes: 1 addition & 1 deletion nativelib/src/main/cpp/moonlight-common-c
Open in desktop
Submodule moonlight-common-c updated 7 files
+7 −1 src/AudioStream.c
+56 −0 src/Connection.c
+81 −6 src/ControlStream.c
+5 −0 src/Limelight-internal.h
+82 −0 src/Limelight.h
+8 −0 src/Misc.c
+26 −0 src/SdpGenerator.c
Loading