Skip to content
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

Jump to bottom

fix: highlight not visible when focus in #35

Merged
merged 2 commits into from
Jan 5, 2024
Merged

fix: highlight not visible when focus in #35

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
563d472
fix: highlight not visible when focus in
asterwyx Jan 5, 2024
c649431
chore: update translations
asterwyx Jan 5, 2024
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
16 changes: 14 additions & 2 deletions qml/AppListView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Item {
// the scroll might stopped before the highlight item scroll to the expected place.
// Thus we use a timer to set back these values with a delay.
listView.highlightMoveDuration = 150
listView.highlightRangeMode = GridView.NoHighlightRange
listView.highlightRangeMode = ListView.NoHighlightRange
}
}

Expand All @@ -34,14 +34,20 @@ Item {
if (character === transliterated1st) {
// we use the highlight move to scroll to item
listView.highlightMoveDuration = 0
listView.highlightRangeMode = GridView.ApplyRange
listView.highlightRangeMode = ListView.StrictlyEnforceRange
listView.currentIndex = i
postScrollDeferTimer.restart()
break
}
}
}

function scrollToHighlight() {
listView.highlightMoveDuration = 0
listView.highlightRangeMode = ListView.StrictlyEnforceRange
postScrollDeferTimer.restart()
}

Component {
id: sectionHeading
ToolButton {
Expand Down Expand Up @@ -86,6 +92,12 @@ Item {
// displayMarginBeginning: -45
clip: true
focus: true
onFocusChanged: {
if (focus) {
// When focus in, we always scroll to the highlight
scrollToHighlight()
}
}

section.property: CategorizedSortProxyModel.sortRoleName // "transliterated" // "category"
section.criteria: section.property === "transliterated" ? ViewSection.FirstCharacter : ViewSection.FullString
Expand Down
66 changes: 33 additions & 33 deletions translations/dde-launchpad.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,52 +14,52 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/AppItemMenu.qml" line="43"/>
<location filename="../qml/AppItemMenu.qml" line="46"/>
<source>Remove from favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/AppItemMenu.qml" line="43"/>
<location filename="../qml/AppItemMenu.qml" line="46"/>
<source>Add to favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/AppItemMenu.qml" line="57"/>
<location filename="../qml/AppItemMenu.qml" line="60"/>
<source>Send to desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/AppItemMenu.qml" line="57"/>
<location filename="../qml/AppItemMenu.qml" line="60"/>
<source>Remove from desktop</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/AppItemMenu.qml" line="67"/>
<location filename="../qml/AppItemMenu.qml" line="70"/>
<source>Remove from dock</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/AppItemMenu.qml" line="67"/>
<location filename="../qml/AppItemMenu.qml" line="70"/>
<source>Send to dock</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/AppItemMenu.qml" line="78"/>
<location filename="../qml/AppItemMenu.qml" line="81"/>
<source>Add to startup</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/AppItemMenu.qml" line="78"/>
<location filename="../qml/AppItemMenu.qml" line="81"/>
<source>Remove from startup</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/AppItemMenu.qml" line="83"/>
<location filename="../qml/AppItemMenu.qml" line="86"/>
<source>Use a proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/AppItemMenu.qml" line="86"/>
<location filename="../qml/AppItemMenu.qml" line="89"/>
<source>Uninstall</source>
<translation type="unfinished"></translation>
</message>
Expand All @@ -80,112 +80,112 @@
<context>
<name>Main</name>
<message>
<location filename="../qml/Main.qml" line="51"/>
<location filename="../qml/Main.qml" line="18"/>
<source>Internet</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/Main.qml" line="53"/>
<location filename="../qml/Main.qml" line="20"/>
<source>Chat</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/Main.qml" line="55"/>
<location filename="../qml/Main.qml" line="22"/>
<source>Music</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/Main.qml" line="57"/>
<location filename="../qml/Main.qml" line="24"/>
<source>Video</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/Main.qml" line="59"/>
<location filename="../qml/Main.qml" line="26"/>
<source>Graphics</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/Main.qml" line="61"/>
<location filename="../qml/Main.qml" line="28"/>
<source>Game</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/Main.qml" line="63"/>
<location filename="../qml/Main.qml" line="30"/>
<source>Office</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/Main.qml" line="65"/>
<location filename="../qml/Main.qml" line="32"/>
<source>Reading</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/Main.qml" line="67"/>
<location filename="../qml/Main.qml" line="34"/>
<source>Development</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/Main.qml" line="69"/>
<location filename="../qml/Main.qml" line="36"/>
<source>System</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/Main.qml" line="71"/>
<location filename="../qml/Main.qml" line="38"/>
<source>Others</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/Main.qml" line="220"/>
<location filename="../qml/Main.qml" line="250"/>
<source>Are you sure you want to uninstall %1?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/Main.qml" line="228"/>
<location filename="../qml/Main.qml" line="258"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/Main.qml" line="236"/>
<location filename="../qml/Main.qml" line="266"/>
<source>Confirm</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WindowedFrame</name>
<message>
<location filename="../qml/WindowedFrame.qml" line="97"/>
<location filename="../qml/WindowedFrame.qml" line="105"/>
<source>Power</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/FullscreenFrame.qml" line="339"/>
<location filename="../qml/WindowedFrame.qml" line="244"/>
<location filename="../qml/FullscreenFrame.qml" line="338"/>
<location filename="../qml/WindowedFrame.qml" line="260"/>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/WindowedFrame.qml" line="107"/>
<location filename="../qml/WindowedFrame.qml" line="117"/>
<source>Control Center</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/WindowedFrame.qml" line="143"/>
<location filename="../qml/WindowedFrame.qml" line="159"/>
<source>My Favorites</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/WindowedFrame.qml" line="173"/>
<location filename="../qml/WindowedFrame.qml" line="189"/>
<source>Add your favorite apps here</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/WindowedFrame.qml" line="184"/>
<location filename="../qml/WindowedFrame.qml" line="200"/>
<source>All Apps</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/FullscreenFrame.qml" line="324"/>
<location filename="../qml/WindowedFrame.qml" line="208"/>
<location filename="../qml/FullscreenFrame.qml" line="323"/>
<location filename="../qml/WindowedFrame.qml" line="224"/>
<source>No search results</source>
<translation type="unfinished"></translation>
</message>
Expand Down
Loading