Skip to content

Add different color for unfocused selected editable text #23947

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

Merged
alice-i-cecile merged 3 commits into from
Apr 23, 2026
Merged

Add different color for unfocused selected editable text #23947

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
8c2abeb
Add different color for unfocused selected editable text
Zeophlite Apr 23, 2026
1fda147
Fix typo
alice-i-cecile Apr 23, 2026
55b85a5
cargo fmt
alice-i-cecile Apr 23, 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
2 changes: 2 additions & 0 deletions crates/bevy_feathers/src/controls/text_input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ fn update_text_cursor_color(
for mut cursor_style in q_text_input.iter_mut() {
cursor_style.color = theme.color(&tokens::TEXT_INPUT_CURSOR);
cursor_style.selection_color = theme.color(&tokens::TEXT_INPUT_SELECTION);
cursor_style.unfocused_selection_color =
theme.color(&tokens::TEXT_INPUT_SELECTION_UNFOCUSED);
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions crates/bevy_feathers/src/dark_theme.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,10 @@ pub fn create_dark_theme() -> ThemeProps {
),
(tokens::TEXT_INPUT_CURSOR, palette::ACCENT.lighter(0.2)),
(tokens::TEXT_INPUT_SELECTION, palette::ACCENT),
(
tokens::TEXT_INPUT_SELECTION_UNFOCUSED,
palette::ACCENT.lighter(0.2),
),
(tokens::TEXT_INPUT_X_AXIS, palette::X_AXIS),
(tokens::TEXT_INPUT_Y_AXIS, palette::Y_AXIS),
(tokens::TEXT_INPUT_Z_AXIS, palette::Z_AXIS),
Expand Down
3 changes: 3 additions & 0 deletions crates/bevy_feathers/src/tokens.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,9 @@ pub const TEXT_INPUT_TEXT_DISABLED: ThemeToken =
pub const TEXT_INPUT_CURSOR: ThemeToken = ThemeToken::new_static("feathers.textinput.cursor");
/// Selection color for text input
pub const TEXT_INPUT_SELECTION: ThemeToken = ThemeToken::new_static("feathers.textinput.selection");
/// Selection color for unfocused text input
pub const TEXT_INPUT_SELECTION_UNFOCUSED: ThemeToken =
ThemeToken::new_static("feathers.textinput.selection.unfocused");
/// Background color for label text
pub const TEXT_INPUT_LABEL_BG: ThemeToken = ThemeToken::new_static("feathers.textinput.label.bg");
/// Sigil color for X
Expand Down
5 changes: 4 additions & 1 deletion crates/bevy_text/src/cursor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use bevy_color::{
palettes::css::{GREEN, RED},
palettes::css::{BLUE, GREEN, RED},
Color,
};
use bevy_ecs::component::Component;
Expand All @@ -16,6 +16,8 @@ pub struct TextCursorStyle {
pub color: Color,
/// Background color of selected text
pub selection_color: Color,
/// Background color of unfocused selected text
pub unfocused_selection_color: Color,
/// If some, overrides the color of selected text
pub selected_text_color: Option<Color>,
}
Expand All @@ -25,6 +27,7 @@ impl Default for TextCursorStyle {
Self {
color: RED.into(),
selection_color: Color::from(GREEN),
unfocused_selection_color: Color::from(BLUE),
Copy link
Copy Markdown
Contributor

@ickshonpe ickshonpe Apr 23, 2026

Choose a reason for hiding this comment

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

The defaults don't matter too much here, but the blue is a bit too prominent, they should be chosen to suggest which is the focused input. Maybe just same as the selection color but with 0.5 alpha or something.

Copy link
Copy Markdown
Member

@alice-i-cecile alice-i-cecile Apr 23, 2026

Choose a reason for hiding this comment

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

I think we should try and pick decent defaults for all of these colors. I'll make a follow-up once this is in.

selected_text_color: None,
}
}
Expand Down
1 change: 1 addition & 0 deletions crates/bevy_ui_render/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ bevy_core_pipeline = { path = "../bevy_core_pipeline", version = "0.19.0-dev" }
bevy_derive = { path = "../bevy_derive", version = "0.19.0-dev" }
bevy_ecs = { path = "../bevy_ecs", version = "0.19.0-dev" }
bevy_image = { path = "../bevy_image", version = "0.19.0-dev" }
bevy_input_focus = { path = "../bevy_input_focus", version = "0.19.0-dev" }
bevy_math = { path = "../bevy_math", version = "0.19.0-dev" }
bevy_mesh = { path = "../bevy_mesh", version = "0.19.0-dev" }
bevy_reflect = { path = "../bevy_reflect", version = "0.19.0-dev" }
Expand Down
20 changes: 17 additions & 3 deletions crates/bevy_ui_render/src/text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use bevy_asset::AssetId;
use bevy_camera::visibility::InheritedVisibility;
use bevy_color::Alpha;
use bevy_ecs::prelude::*;
use bevy_input_focus::InputFocus;
use bevy_math::{Affine2, Rect, Vec2};
use bevy_render::{sync_world::TemporaryRenderEntity, Extract};
use bevy_sprite::BorderRect;
Expand Down Expand Up @@ -33,6 +34,7 @@ pub fn extract_text_cursor(
)>,
>,
camera_map: Extract<UiCameraMap>,
input_focus: Extract<Option<Res<InputFocus>>>,
) {
let mut camera_mapper = camera_map.get_mapper();

Expand Down Expand Up @@ -74,10 +76,22 @@ pub fn extract_text_cursor(
maybe_clip.map(|clip| clip.clip)
};

if !text_layout_info.selection_rects.is_empty()
&& !cursor_style.selection_color.is_fully_transparent()
let mut focused = false;

if let Some(input_focus) = input_focus.as_ref()
&& Some(entity) == input_focus.get()
{
let selection_color = cursor_style.selection_color.to_linear();
focused = true;
}

let sc = if focused {
cursor_style.selection_color
} else {
cursor_style.unfocused_selection_color
};

if !text_layout_info.selection_rects.is_empty() && !sc.is_fully_transparent() {
let selection_color = sc.to_linear();

for selection in text_layout_info.selection_rects.iter() {
extracted_uinodes.uinodes.push(ExtractedUiNode {
Expand Down