Skip to content

Commit dc03cf9

Browse files
committed
Merge pull request #103508 from KoBeWi/caret_can_into_draw
Fix `caret_force_displayed`
2 parents 7dc6b38 + 6d2f18c commit dc03cf9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

doc/classes/LineEdit.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
The caret's column position inside the [LineEdit]. When set, the text may scroll to accommodate it.
253253
</member>
254254
<member name="caret_force_displayed" type="bool" setter="set_caret_force_displayed" getter="is_caret_force_displayed" default="false">
255-
If [code]true[/code], the [LineEdit] will always show the caret, even if focus is lost.
255+
If [code]true[/code], the [LineEdit] will always show the caret, even if not editing or focus is lost.
256256
</member>
257257
<member name="caret_mid_grapheme" type="bool" setter="set_caret_mid_grapheme_enabled" getter="is_caret_mid_grapheme_enabled" default="false">
258258
Allow moving caret, selecting and removing the individual composite character components.

scene/gui/line_edit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1733,7 +1733,7 @@ void LineEdit::_validate_caret_can_draw() {
17331733
draw_caret = true;
17341734
caret_blink_timer = 0.0;
17351735
}
1736-
caret_can_draw = editing && (window_has_focus || (menu && menu->has_focus())) && (has_focus() || caret_force_displayed);
1736+
caret_can_draw = (caret_force_displayed && !is_part_of_edited_scene()) || (editing && (window_has_focus || (menu && menu->has_focus())) && has_focus());
17371737
}
17381738

17391739
void LineEdit::delete_char() {

0 commit comments

Comments
 (0)