Skip to content

style(stream-menu): restore glass translucency #83

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 2 commits into from
Jul 26, 2026
Merged

style(stream-menu): restore glass translucency #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
045c797
style(stream-menu): restore glass translucency
qiin2333 Jul 25, 2026
a5f8fc4
style(stream-menu): restore sock menu styling
qiin2333 Jul 26, 2026
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
3 changes: 2 additions & 1 deletion entry/src/main/ets/common/OverlayConstants.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ export class StreamMenuColors {
static readonly TextFaint = $r('app.color.stream_menu_text_faint');
static readonly AccentBlue = $r('app.color.stream_menu_accent_blue');
static readonly AccentPink = $r('app.color.stream_menu_accent_pink');
static readonly AccentBlueText = $r('app.color.stream_menu_accent_blue_text');
static readonly AccentPinkText = $r('app.color.stream_menu_accent_pink_text');
static readonly AccentGold = $r('app.color.stream_menu_accent_gold');
static readonly BlueSurface = $r('app.color.stream_menu_blue_surface');
static readonly BlueBorder = $r('app.color.stream_menu_blue_border');
Expand All @@ -61,7 +63,6 @@ export class StreamMenuColors {
static readonly OnAccent = $r('app.color.stream_menu_on_accent');
static readonly Success = $r('app.color.stream_menu_success');
static readonly SuccessSurface = $r('app.color.stream_menu_success_surface');
static readonly OnPastel = $r('app.color.stream_menu_on_pastel');
}

/** 覆盖层背景色 */
Expand Down
52 changes: 29 additions & 23 deletions entry/src/main/ets/components/dialogs/GameMenuDialog.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ interface MenuItem {
label: string;
bgColor: string;
borderColor: string;
textColor: string;
}

/** 触摸模式选项 */
Expand Down Expand Up @@ -103,20 +104,21 @@ const CARD_USAGE_KEY = 'game_menu_card_usage';

// 马卡龙色系菜单配置
const MENU_ITEMS: MenuItem[] = [
{ icon: '✦', label: 'HDR', bgColor: '#F7EBC7', borderColor: '#D0A850' },
{ icon: '◎', label: 'USB驱动', bgColor: '#F7D1D1', borderColor: '#D87070' },
{ icon: '⌨', label: '键盘', bgColor: '#C7F7E0', borderColor: '#50C080' },
{ icon: '☝', label: '触控', bgColor: '#E0D4F7', borderColor: '#9080C0' },
{ icon: '🎮', label: '手柄', bgColor: '#D4E8F7', borderColor: '#6098C0' },
{ icon: '🖱', label: '鼠标', bgColor: '#F7E0C7', borderColor: '#C08050' },
{ icon: '✕', label: '退出', bgColor: '#F7CFCF', borderColor: '#D06060' }
{ icon: '✦', label: 'HDR', bgColor: '#F7EBC7', borderColor: '#D0A850', textColor: '#7B632F' },
{ icon: '◎', label: 'USB驱动', bgColor: '#F7D1D1', borderColor: '#D87070', textColor: '#8A4848' },
{ icon: '⌨', label: '键盘', bgColor: '#C7F7E0', borderColor: '#50C080', textColor: '#30734D' },
{ icon: '☝', label: '触控', bgColor: '#E0D4F7', borderColor: '#9080C0', textColor: '#5F547F' },
{ icon: '🎮', label: '手柄', bgColor: '#D4E8F7', borderColor: '#6098C0', textColor: '#406681' },
{ icon: '🖱', label: '鼠标', bgColor: '#F7E0C7', borderColor: '#C08050', textColor: '#835736' },
{ icon: '✕', label: '退出', bgColor: '#F7CFCF', borderColor: '#D06060', textColor: '#904242' }
];

const MENU_OFFSETS: number[] = [25, 55, 70, 35, 45, 30, 50];

// 激活色
const ACTIVE_BG_COLOR = '#C7F7D4';
const ACTIVE_BORDER_COLOR = '#50A860';
const ACTIVE_TEXT_COLOR = '#367241';

@CustomDialog
export struct GameMenuDialog {
Expand Down Expand Up @@ -566,6 +568,13 @@ export struct GameMenuDialog {
return MENU_ITEMS[index].borderColor;
}

private getMenuTextColor(index: number): string {
if ((index === 1 && this.isUsbDriverMode) || (index === 5 && this.isMouseEmulationActive)) {
return ACTIVE_TEXT_COLOR;
}
return MENU_ITEMS[index].textColor;
}

private async loadGyroSettings(): Promise<void> {
this.hasGyroscope = DeviceSensorService.getInstance().hasGyroscope();
const gyroAssist = GyroAssistService.getInstance();
Expand Down Expand Up @@ -921,9 +930,7 @@ export struct GameMenuDialog {
.width(OV_CARD_WIDTH)
.height(36)
.padding({ left: 14, right: 14 })
.borderRadius(OV_CARD_RADIUS)
.backgroundColor(StreamMenuColors.Surface)
.border({ width: 1, color: StreamMenuColors.Border })
.cardStyle()
.alignItems(VerticalAlign.Center)
.onClick(() => {
animateTo({ duration: 200, curve: Curve.EaseInOut }, () => {
Expand Down Expand Up @@ -1001,7 +1008,7 @@ export struct GameMenuDialog {
Text('编辑布局')
.fontSize(12)
.fontWeight(FontWeight.Medium)
.fontColor(StreamMenuColors.AccentPink)
.fontColor(StreamMenuColors.AccentPinkText)
.padding({ left: 14, right: 14, top: 7, bottom: 7 })
.borderRadius(14)
.backgroundColor(StreamMenuColors.PinkSurface)
Expand All @@ -1013,7 +1020,7 @@ export struct GameMenuDialog {
Text('导出')
.fontSize(12)
.fontWeight(FontWeight.Medium)
.fontColor(StreamMenuColors.AccentBlue)
.fontColor(StreamMenuColors.AccentBlueText)
.padding({ left: 14, right: 14, top: 7, bottom: 7 })
.borderRadius(14)
.backgroundColor(StreamMenuColors.BlueSurface)
Expand All @@ -1025,7 +1032,7 @@ export struct GameMenuDialog {
Text('导入')
.fontSize(12)
.fontWeight(FontWeight.Medium)
.fontColor(StreamMenuColors.AccentBlue)
.fontColor(StreamMenuColors.AccentBlueText)
.padding({ left: 14, right: 14, top: 7, bottom: 7 })
.borderRadius(14)
.backgroundColor(StreamMenuColors.BlueSurface)
Expand All @@ -1052,7 +1059,7 @@ export struct GameMenuDialog {
if (this.isPanZoomActive) {
Text('重置')
.fontSize(11)
.fontColor(StreamMenuColors.AccentBlue)
.fontColor(StreamMenuColors.AccentBlueText)
.fontWeight(FontWeight.Medium)
.padding({ left: 10, right: 10, top: 4, bottom: 4 })
.borderRadius(10)
Expand Down Expand Up @@ -1154,7 +1161,7 @@ export struct GameMenuDialog {
Blank()
Text(`${Math.round(this.controllerOpacityLocal * 100)}%`)
.fontSize(OV_FONT_MD)
.fontColor(StreamMenuColors.AccentBlue)
.fontColor(StreamMenuColors.AccentBlueText)
.fontWeight(FontWeight.Medium)
}
.width('100%')
Expand Down Expand Up @@ -1199,7 +1206,7 @@ export struct GameMenuDialog {
Blank()
Text(`${Math.round(this.controllerScaleLocal * 100)}%`)
.fontSize(OV_FONT_MD)
.fontColor(StreamMenuColors.AccentBlue)
.fontColor(StreamMenuColors.AccentBlueText)
.fontWeight(FontWeight.Medium)
}
.width('100%')
Expand Down Expand Up @@ -1306,7 +1313,7 @@ export struct GameMenuDialog {
Blank()
Text(`${this.audioVibrationStrength}%`)
.fontSize(OV_FONT_MD)
.fontColor(StreamMenuColors.AccentPink)
.fontColor(StreamMenuColors.AccentPinkText)
.fontWeight(FontWeight.Medium)
}
.width('100%')
Expand Down Expand Up @@ -1399,7 +1406,7 @@ export struct GameMenuDialog {
Blank()
Text(this.formatBitrate(this.currentBitrate))
.fontSize(12)
.fontColor(StreamMenuColors.AccentPink)
.fontColor(StreamMenuColors.AccentPinkText)
.fontWeight(FontWeight.Medium)
}
.width('100%')
Expand Down Expand Up @@ -1470,7 +1477,7 @@ export struct GameMenuDialog {
Blank()
Text(this.isAdjustingBitrate ? '调整中...' : this.formatBitrate(this.sliderValueToBitrate(this.bitrateSliderValue)))
.fontSize(OV_FONT_MD)
.fontColor(this.isAdjustingBitrate ? StreamMenuColors.TextDim : StreamMenuColors.AccentPink)
.fontColor(this.isAdjustingBitrate ? StreamMenuColors.TextDim : StreamMenuColors.AccentPinkText)
.fontWeight(FontWeight.Bold)
Blank()
Text('200').fontSize(OV_FONT_SM).fontColor(StreamMenuColors.TextDim)
Expand Down Expand Up @@ -1517,7 +1524,7 @@ export struct GameMenuDialog {

Text(this.hasGyroscope ? '陀螺仪 → 右摇杆映射' : '⚠ 设备无陀螺仪')
.fontSize(OV_FONT_SM)
.fontColor(this.hasGyroscope ? StreamMenuColors.TextFaint : StreamMenuColors.AccentPink)
.fontColor(this.hasGyroscope ? StreamMenuColors.TextFaint : StreamMenuColors.AccentPinkText)
.width('100%')
.padding({ left: 16, right: 16, bottom: this.gyroEnabled ? 8 : 14 })

Expand All @@ -1530,7 +1537,7 @@ export struct GameMenuDialog {
Blank()
Text(`${this.gyroSensitivity.toFixed(1)}x`)
.fontSize(OV_FONT_MD)
.fontColor(StreamMenuColors.AccentBlue)
.fontColor(StreamMenuColors.AccentBlueText)
.fontWeight(FontWeight.Medium)
}
.width('100%')
Expand Down Expand Up @@ -1736,7 +1743,7 @@ export struct GameMenuDialog {
Text(this.getMenuLabel(index))
.fontSize(12)
.fontWeight(FontWeight.Bold)
.fontColor(StreamMenuColors.OnPastel)
.fontColor(this.getMenuTextColor(index))
}
.width(75)
.height(36)
Expand All @@ -1760,7 +1767,6 @@ export struct GameMenuDialog {
}
.height(40)
.padding(2)
.shadow({ radius: 6, color: StreamMenuColors.Shadow, offsetY: 2 })
.scale({ x: this.scales[index], y: this.scales[index] })
.translate({ x: this.positions[index] })
.margin({ right: MENU_OFFSETS[index], bottom: 4 })
Expand Down
20 changes: 12 additions & 8 deletions entry/src/main/resources/base/element/color.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
},
{
"name": "stream_menu_surface",
"value": "#EAF7F9FC"
"value": "#C0F7F9FC"
},
{
"name": "stream_menu_control",
Expand Down Expand Up @@ -146,15 +146,15 @@
},
{
"name": "stream_menu_text_medium",
"value": "#E03B4852"
"value": "#F52E3A44"
},
{
"name": "stream_menu_text_dim",
"value": "#ED48545E"
"value": "#F535424C"
},
{
"name": "stream_menu_text_faint",
"value": "#E044505A"
"value": "#E02E3A44"
},
{
"name": "stream_menu_accent_blue",
Expand All @@ -164,6 +164,14 @@
"name": "stream_menu_accent_pink",
"value": "#9C294B"
},
{
"name": "stream_menu_accent_blue_text",
"value": "#0E436C"
},
{
"name": "stream_menu_accent_pink_text",
"value": "#741A34"
},
{
"name": "stream_menu_accent_gold",
"value": "#8A5700"
Expand Down Expand Up @@ -199,10 +207,6 @@
{
"name": "stream_menu_success_surface",
"value": "#14126638"
},
{
"name": "stream_menu_on_pastel",
"value": "#E61A1E24"
}
]
}
18 changes: 11 additions & 7 deletions entry/src/main/resources/dark/element/color.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
},
{
"name": "stream_menu_surface",
"value": "#B31A1E24"
"value": "#A61A1E24"
},
{
"name": "stream_menu_control",
Expand Down Expand Up @@ -150,11 +150,11 @@
},
{
"name": "stream_menu_text_dim",
"value": "#C8FFFFFF"
"value": "#D0FFFFFF"
},
{
"name": "stream_menu_text_faint",
"value": "#C0FFFFFF"
"value": "#C8FFFFFF"
},
{
"name": "stream_menu_accent_blue",
Expand All @@ -164,6 +164,14 @@
"name": "stream_menu_accent_pink",
"value": "#FFD0D9"
},
{
"name": "stream_menu_accent_blue_text",
"value": "#BCE5F0"
},
{
"name": "stream_menu_accent_pink_text",
"value": "#FFD0D9"
},
{
"name": "stream_menu_accent_gold",
"value": "#FFD166"
Expand Down Expand Up @@ -199,10 +207,6 @@
{
"name": "stream_menu_success_surface",
"value": "#40202F27"
},
{
"name": "stream_menu_on_pastel",
"value": "#E61A1E24"
}
]
}
Loading