migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 13:50:04 -04:00
Code Activity

Refactor(egui): egui::style::ImePreedit -> egui::style::ImeComposition

Browse Source
This commit is contained in:
umajho
2026-04-09 19:32:34 +08:00
parent b57b8dbbd1
commit d9c229a36f
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
crates/egui/src/style.rs
View File

@@ -1038,7 +1038,7 @@ pub struct Visuals {
pub widgets: Widgets, pub widgets: Widgets,
pub selection: Selection, pub selection: Selection,
pub ime_preedit: ImePreedit, pub ime_composition: ImeComposition,
/// The color used for [`crate::Hyperlink`], /// The color used for [`crate::Hyperlink`],
pub hyperlink_color: Color32, pub hyperlink_color: Color32,
@@ -1209,11 +1209,15 @@ pub struct Selection {
pub stroke: Stroke, pub stroke: Stroke,
} }
/// Visual style for IME composition.
#[derive(Clone, Copy, Debug, PartialEq)] #[derive(Clone, Copy, Debug, PartialEq)]
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))] #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
#[cfg_attr(feature = "serde", serde(default))] #[cfg_attr(feature = "serde", serde(default))]
pub struct ImePreedit { pub struct ImeComposition {
/// Stroke used to underline the actively composed segment.
pub active_underline_stroke: Stroke, pub active_underline_stroke: Stroke,
/// Stroke used to underline those non-active segments.
pub inactive_underline_stroke: Stroke, pub inactive_underline_stroke: Stroke,
} }
@@ -1500,7 +1504,7 @@ impl Visuals {
weak_text_color: None, weak_text_color: None,
widgets: Widgets::default(), widgets: Widgets::default(),
selection: Selection::default(), selection: Selection::default(),
ime_preedit: ImePreedit::default(), ime_composition: ImeComposition::default(),
hyperlink_color: Color32::from_rgb(90, 170, 255), hyperlink_color: Color32::from_rgb(90, 170, 255),
faint_bg_color: Color32::from_additive_luminance(5), // visible, but barely so faint_bg_color: Color32::from_additive_luminance(5), // visible, but barely so
extreme_bg_color: Color32::from_gray(10), // e.g. TextEdit background extreme_bg_color: Color32::from_gray(10), // e.g. TextEdit background
@@ -1564,7 +1568,7 @@ impl Visuals {
}, },
widgets: Widgets::light(), widgets: Widgets::light(),
selection: Selection::light(), selection: Selection::light(),
ime_preedit: ImePreedit::light(), ime_composition: ImeComposition::light(),
hyperlink_color: Color32::from_rgb(0, 155, 255), hyperlink_color: Color32::from_rgb(0, 155, 255),
faint_bg_color: Color32::from_additive_luminance(5), // visible, but barely so faint_bg_color: Color32::from_additive_luminance(5), // visible, but barely so
extreme_bg_color: Color32::from_gray(255), // e.g. TextEdit background extreme_bg_color: Color32::from_gray(255), // e.g. TextEdit background
@@ -1628,7 +1632,7 @@ impl Default for Selection {
} }
} }
impl ImePreedit { impl ImeComposition {
fn dark() -> Self { fn dark() -> Self {
// Same as the default value of [`TextCursorStyle::stroke`] in dark mode. // Same as the default value of [`TextCursorStyle::stroke`] in dark mode.
let active_underline_stroke = Stroke::new(2.0, Color32::from_rgb(192, 222, 255)); let active_underline_stroke = Stroke::new(2.0, Color32::from_rgb(192, 222, 255));
@@ -1656,7 +1660,7 @@ impl ImePreedit {
} }
} }
impl Default for ImePreedit { impl Default for ImeComposition {
fn default() -> Self { fn default() -> Self {
Self::dark() Self::dark()
} }
@@ -2183,16 +2187,16 @@ impl Selection {
} }
} }
impl ImePreedit { impl ImeComposition {
pub fn ui(&mut self, ui: &mut crate::Ui) { pub fn ui(&mut self, ui: &mut crate::Ui) {
let Self { let Self {
active_underline_stroke, active_underline_stroke,
inactive_underline_stroke, inactive_underline_stroke,
} = self; } = self;
ui.label("IME preedit"); ui.label("IME composition");
Grid::new("ime_preedit").num_columns(2).show(ui, |ui| { Grid::new("ime_composition").num_columns(2).show(ui, |ui| {
ui.label("Active underline stroke"); ui.label("Active underline stroke");
ui.add(active_underline_stroke); ui.add(active_underline_stroke);
ui.end_row(); ui.end_row();
@@ -2260,7 +2264,7 @@ impl Visuals {
weak_text_color, weak_text_color,
widgets, widgets,
selection, selection,
ime_preedit, ime_composition,
hyperlink_color, hyperlink_color,
faint_bg_color, faint_bg_color,
extreme_bg_color, extreme_bg_color,
@@ -2468,7 +2472,7 @@ impl Visuals {
ui.collapsing("Widgets", |ui| widgets.ui(ui)); ui.collapsing("Widgets", |ui| widgets.ui(ui));
ui.collapsing("Selection", |ui| selection.ui(ui)); ui.collapsing("Selection", |ui| selection.ui(ui));
ui.collapsing("IME preedit", |ui| ime_preedit.ui(ui)); ui.collapsing("IME preedit", |ui| ime_composition.ui(ui));
ui.collapsing("Misc", |ui| { ui.collapsing("Misc", |ui| {
ui.add(Slider::new(resize_corner_size, 0.0..=20.0).text("resize_corner_size")); ui.add(Slider::new(resize_corner_size, 0.0..=20.0).text("resize_corner_size"));

4
crates/egui/src/text_selection/visuals.rs
View File

@@ -159,8 +159,8 @@ pub(crate) fn paint_ime_preedit_text_visuals(
} }
let visuals = ui.visuals(); let visuals = ui.visuals();
let active_underline_stroke = visuals.ime_preedit.active_underline_stroke; let active_underline_stroke = visuals.ime_composition.active_underline_stroke;
let inactive_underline_stroke = visuals.ime_preedit.inactive_underline_stroke; let inactive_underline_stroke = visuals.ime_composition.inactive_underline_stroke;
if let Some(relative_active_range) = &relative_active_range if let Some(relative_active_range) = &relative_active_range
&& !relative_active_range.is_empty() && !relative_active_range.is_empty()