fix(dock): Launcher popup menu in small window mode fails to update with system font size changes#1483
Open
electricface wants to merge 1 commit intolinuxdeepin:masterfrom
Open
Conversation
with system font size changes - Add font propagation support to PopupWindow - Add a `font` Q_PROPERTY to PopupWindow that propagates the font to all QQuickControl descendants via QQuickControlPrivate::updateFontRecur(), mirroring the behavior of QQuickApplicationWindow. - Bind PanelPopupWindow.font to D.DTK.fontManager.t6 so that all popup content (tooltips, menus, panels) automatically inherits and dynamically responds to system font changes without requiring per-applet fixes. Log: Fix launcher popup menu in small window mode fails to update with system font size changes PMS: BUG-335169
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: electricface The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Reviewer's GuideAdds font propagation support to PopupWindow so that popup-based UIs (panel popups, menus, tooltips) inherit and dynamically react to system font changes, wiring this through a new font Q_PROPERTY and using Qt Quick Templates2 private APIs, plus the necessary build-system updates and QML bindings. Sequence diagram for font change propagation to popup controlssequenceDiagram
participant User
participant SystemSettings
participant DDTKFontManager as DDTK_fontManager
participant PanelPopupQML as PanelPopupWindow_qml
participant PopupWindow
participant ContentItem as QQuickItem_contentItem
participant QQuickControlPrivate
User->>SystemSettings: changeFontSize(newSize)
SystemSettings-->>DDTKFontManager: update t6.font(newSize)
DDTKFontManager-->>PanelPopupQML: t6.family, t6.pixelSize changed
PanelPopupQML-->>PopupWindow: update font.family, font.pixelSize via binding
PopupWindow->>PopupWindow: setFont(QFont from QML)
PopupWindow->>PopupWindow: resolve with QGuiApplication::font()
PopupWindow->>PopupWindow: propagateFontToContentItem(m_font)
PopupWindow->>ContentItem: contentItem()
PopupWindow->>QQuickControlPrivate: updateFontRecur(contentItem, m_font)
QQuickControlPrivate-->>ContentItem: applyFontToControlsRecursively(m_font)
ContentItem-->>User: popup menu re-rendered with new font size
Class diagram for updated PopupWindow font propagationclassDiagram
class QQuickWindowQmlImpl
class PopupWindow {
<<QML_NAMED_ELEMENT_PopupWindow>>
+PopupWindow(parent: QWindow*)
+QFont font() const
+void setFont(font: QFont const&)
+void resetFont()
+void mouseReleaseEvent(event: QMouseEvent*)
+void mousePressEvent(event: QMouseEvent*)
+void mouseMoveEvent(event: QMouseEvent*)
+void fontChanged()
-void propagateFontToContentItem(font: QFont const&)
-bool m_dragging
-bool m_pressing
-QFont m_font
-bool m_hasExplicitFont
}
PopupWindow --|> QQuickWindowQmlImpl
Architecture/flow diagram for font propagation across componentsflowchart LR
SystemFonts["System font settings"] --> DDTKFontManager["D.DTK.fontManager.t6"]
DDTKFontManager --> PanelPopupWindowQML["PanelPopupWindow_qml<br/>font.family,font.pixelSize bindings"]
PanelPopupWindowQML --> PopupWindow["PopupWindow<br/>Q_PROPERTY font"]
PopupWindow --> QQuickItemContentItem["QQuickItem contentItem()"]
QQuickItemContentItem --> QQuickControlPrivate["QQuickControlPrivate::updateFontRecur"]
QQuickControlPrivate --> PopupControls["QQuickControl descendants<br/>(menus, tooltips, panels)"]
User["User"] --> SystemFonts
PopupControls --> User
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
deepin pr auto review这份代码修改主要是为 以下是对该 diff 的详细审查意见，涵盖语法逻辑、代码质量、代码性能和代码安全四个方面： 1. 语法逻辑
2. 代码质量
3. 代码性能
4. 代码安全
总结该代码修改整体质量较高，逻辑清晰，正确实现了字体属性的添加和传播功能。主要需要注意以下几点：
改进建议代码片段 (针对 m_hasExplicitFont 的逻辑补充)： 如果 QFont PopupWindow::font() const
{
// 如果没有显式设置字体，返回空字体（让 QML 引擎解析为默认值）或应用默认字体
// 这取决于具体的设计需求。通常 QML 属性系统希望返回当前生效的值。
// 目前的实现直接返回 m_font，这在 resetFont 后是默认 QFont，在 setFont 后是解析后的 QFont。
// 这种行为是自洽的。
return m_font;
}目前的实现中， |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
There was a problem hiding this comment.
Hey - I've left some high level feedback:
- In
resetFont()you reset to a default-constructedQFont, which breaks the symmetry withsetFont()(which resolves againstQGuiApplication::font()); consider resetting toQGuiApplication::font()(or clearing the resolve mask appropriately) so that reset restores the effective system font rather than an uninitialized default. - The
m_hasExplicitFontflag is set but never read; either remove it to simplify the implementation or make use of it (for example to distinguish between explicit and inherited fonts when reacting to external font changes).
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- In `resetFont()` you reset to a default-constructed `QFont`, which breaks the symmetry with `setFont()` (which resolves against `QGuiApplication::font()`); consider resetting to `QGuiApplication::font()` (or clearing the resolve mask appropriately) so that reset restores the effective system font rather than an uninitialized default.
- The `m_hasExplicitFont` flag is set but never read; either remove it to simplify the implementation or make use of it (for example to distinguish between explicit and inherited fonts when reacting to external font changes).Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fontQ_PROPERTY to PopupWindow thatpropagates the font to all QQuickControl descendants via
QQuickControlPrivate::updateFontRecur(), mirroring the behavior
of QQuickApplicationWindow.
popup content (tooltips, menus, panels) automatically inherits
and dynamically responds to system font changes without requiring
per-applet fixes.
Log: Fix launcher popup menu in small window mode fails to update
with system font size changes
PMS: BUG-335169
Summary by Sourcery
Propagate system font settings to popup windows so launcher and panel popups update correctly when font size changes.
Bug Fixes:
Enhancements:
Build: