Skip to content

Fix up references to full-screen modes #20655

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

Open
seanbudd wants to merge 3 commits into
base: beta
Choose a base branch
from
+7 −16
Open

Fix up references to full-screen modes #20655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4016d9e
Fix up references to full-screen modes
seanbudd Aug 13, 2026
b120a57
Apply suggestion from @seanbudd
seanbudd Aug 13, 2026
726315c
Fix double group
seanbudd Aug 13, 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
6 changes: 3 additions & 3 deletions source/_magnifier/commands.py
View file
Open in desktop

@SaschaCowley SaschaCowley Aug 13, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nvda/source/_magnifier/commands.py

Line 274 in 058beb5

"""Cycle through full-screen modes (center, border, relative)"""

@seanbudd seanbudd Aug 14, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I intentionally avoiding changing all our internal references as the name for this feature is not stable, and will probably be changed again in future

Original file line number Diff line number Diff line change
Expand Up @@ -286,14 +286,14 @@ def toggleFullscreenMode() -> None:
currentMode = fullscreenMagnifier._fullscreenMode
idx = modes.index(currentMode)
newMode = modes[(idx + 1) % len(modes)]
log.debug(f"Changing full-screen mode from {currentMode} to {newMode}")
log.debug(f"Changing tracking mode from {currentMode} to {newMode}")

@SaschaCowley SaschaCowley Aug 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Internal-facing; should be reverted

fullscreenMagnifier._fullscreenMode = newMode
setFullscreenMode(newMode)
ui.message(
pgettext(
"magnifier",
# Translators: Message announced when changing the full-screen mode with {mode} being the new full-screen mode.
"Full-screen mode {mode}",
# Translators: Message announced when changing the tracking mode with {mode} being the new tracking mode.
"Tracking mode {mode}",
).format(mode=newMode.displayString),
)

Expand Down
2 changes: 1 addition & 1 deletion source/_magnifier/fullscreenMagnifier.py
View file
Open in desktop
Comment thread
seanbudd marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def _startMagnifier(self) -> None:
return
if _isDebug():
log.debug(
f"Starting magnifier with zoom level {self.zoomLevel} and filter {self.filterType} and full-screen mode {self._fullscreenMode}",
f"Starting magnifier with zoom level {self.zoomLevel} and filter {self.filterType} and tracking mode {self._fullscreenMode}",

@SaschaCowley SaschaCowley Aug 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Internal, should be reverted

)
try:
self._initializeNativeMagnification()
Expand Down
4 changes: 2 additions & 2 deletions source/_magnifier/utils/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ def _displayStringLabels(self) -> dict["MagnifierAction", str]:
self.TOGGLE_FILTER: pgettext("magnifier action", "cycle color filters"),
# Translators: Action description for changing magnifier view.
self.CHANGE_MAGNIFIER_VIEW: pgettext("magnifier action", "change magnifier view"),
# Translators: Action description for changing full-screen mode.
self.CHANGE_FULLSCREEN_MODE: pgettext("magnifier action", "change full-screen mode"),
# Translators: Action description for changing tracking mode.
self.CHANGE_FULLSCREEN_MODE: pgettext("magnifier action", "change tracking mode"),
# Translators: Action description for showing entire screen overview.
self.START_SPOTLIGHT: pgettext("magnifier action", "show screen overview"),
}
Expand Down
11 changes: 1 addition & 10 deletions source/gui/settingsDialogs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6202,17 +6202,8 @@ def makeSettings(
checkBox.Bind(wx.EVT_CHECKBOX, self._onImmediateSettingChange)
self._trackingTypeCheckBoxes[trackingType] = checkBox

# Tracking GROUP
# Translators: This is the label for a group of tracking magnifier options in the
# magnifier settings panel
trackingGroupText = _("Tracking")
self.trackingGroupSizer = wx.StaticBoxSizer(wx.VERTICAL, self, label=trackingGroupText)
trackingGroupBox = self.trackingGroupSizer.GetStaticBox()
trackingGroup = guiHelper.BoxSizerHelper(trackingGroupBox, sizer=self.trackingGroupSizer)
sHelper.addItem(trackingGroup)

# Tracking MODE SETTINGS
# Translators: The label for a setting in magnifier settings to select the full-screen mode
# Translators: The label for a setting in magnifier settings to select the tracking mode
trackingModeLabelText = _("&Tracking mode:")
trackingModeChoices = [mode.displayString for mode in FullScreenMode]
self.trackingModeList = trackingGroup.addLabeledControl(
Comment thread
seanbudd marked this conversation as resolved.
Expand Down
Loading