mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-18 04:25:56 +08:00
Due to collapsing pop-ups on scrollbar change fix, textfields also lost focus.
CURA-12254
This commit is contained in:
parent
667a27e2d2
commit
64cdb31252
@ -53,6 +53,7 @@ Item
|
|||||||
signal showTooltip(string text)
|
signal showTooltip(string text)
|
||||||
signal hideTooltip()
|
signal hideTooltip()
|
||||||
signal showAllHiddenInheritedSettings(string category_id)
|
signal showAllHiddenInheritedSettings(string category_id)
|
||||||
|
signal setScrollPositionChangeLoseFocus(bool lose_focus)
|
||||||
|
|
||||||
function createTooltipText()
|
function createTooltipText()
|
||||||
{
|
{
|
||||||
|
@ -148,6 +148,11 @@ SettingItem
|
|||||||
if(activeFocus)
|
if(activeFocus)
|
||||||
{
|
{
|
||||||
base.focusReceived();
|
base.focusReceived();
|
||||||
|
setScrollPositionChangeLoseFocus(false);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
setScrollPositionChangeLoseFocus(true);
|
||||||
}
|
}
|
||||||
base.focusGainedByClick = false;
|
base.focusGainedByClick = false;
|
||||||
}
|
}
|
||||||
|
@ -15,6 +15,7 @@ Item
|
|||||||
|
|
||||||
property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel()
|
property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel()
|
||||||
property bool findingSettings
|
property bool findingSettings
|
||||||
|
property bool loseFocusOnScrollPositionChange: true
|
||||||
|
|
||||||
Item
|
Item
|
||||||
{
|
{
|
||||||
@ -195,7 +196,7 @@ Item
|
|||||||
onPositionChanged: {
|
onPositionChanged: {
|
||||||
// This removes focus from items when scrolling.
|
// This removes focus from items when scrolling.
|
||||||
// This fixes comboboxes staying open and scrolling container
|
// This fixes comboboxes staying open and scrolling container
|
||||||
if (!activeFocus && !filter.activeFocus) {
|
if (!activeFocus && !filter.activeFocus && loseFocusOnScrollPositionChange) {
|
||||||
forceActiveFocus();
|
forceActiveFocus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -378,6 +379,10 @@ Item
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
function onSetScrollPositionChangeLoseFocus(lose_focus)
|
||||||
|
{
|
||||||
|
loseFocusOnScrollPositionChange = lose_focus;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user