Introduce TextInput.caps-mode

Author: badicsalex

api/cpp/cbindgen.rs

@@ -327,6 +327,7 @@ fn gen_corelib(
         "FillRule",
         "MouseCursor",
         "InputType",
+        "CapsMode",
         "StandardButtonKind",
         "DialogButtonRole",
         "FocusReason",

internal/backends/android-activity/javahelper.rs

@@ -4,7 +4,7 @@
 use super::*;
 use i_slint_core::api::{PhysicalPosition, PhysicalSize};
 use i_slint_core::graphics::{euclid, Color};
-use i_slint_core::items::{ColorScheme, InputType};
+use i_slint_core::items::{CapsMode, ColorScheme, InputType};
 use i_slint_core::platform::WindowAdapter;
 use i_slint_core::SharedString;
 use jni::objects::{JClass, JObject, JString, JValue};
@@ -178,7 +178,21 @@ impl JavaHelper {
 
             let class_it = env.find_class("android/text/InputType")?;
             let input_type = match data.input_type {
-                InputType::Text => env.get_static_field(&class_it, "TYPE_CLASS_TEXT", "I")?.i()?,
+                InputType::Text => {
+                    let caps_mode = match data.caps_mode {
+                        CapsMode::None => 0 as jint,
+                        CapsMode::Sentences => env
+                            .get_static_field(&class_it, "TYPE_TEXT_FLAG_CAP_SENTENCES", "I")?
+                            .i()?,
+                        CapsMode::Words => {
+                            env.get_static_field(&class_it, "TYPE_TEXT_FLAG_CAP_WORDS", "I")?.i()?
+                        }
+                        CapsMode::All => env
+                            .get_static_field(&class_it, "TYPE_TEXT_FLAG_CAP_CHARACTERS", "I")?
+                            .i()?,
+                    };
+                    env.get_static_field(&class_it, "TYPE_CLASS_TEXT", "I")?.i()? | caps_mode
+                }
                 InputType::Password => {
                     env.get_static_field(&class_it, "TYPE_TEXT_VARIATION_PASSWORD", "I")?.i()?
                         | env.get_static_field(&class_it, "TYPE_CLASS_TEXT", "I")?.i()?

internal/backends/qt/qt_widgets/lineedit.rs

@@ -3,7 +3,7 @@
 
 use i_slint_core::graphics::{Image, Rgba8Pixel, SharedPixelBuffer};
 use i_slint_core::input::FocusEventResult;
-use i_slint_core::items::InputType;
+use i_slint_core::items::{CapsMode, InputType};
 
 use super::*;
 
@@ -20,6 +20,7 @@ pub struct NativeLineEdit {
     pub enabled: Property<bool>,
     pub input_type: Property<InputType>,
     pub clear_icon: Property<Image>,
+    pub caps_mode: Property<CapsMode>,
     widget_ptr: std::cell::Cell<SlintTypeErasedWidgetPtr>,
     animation_tracker: Property<i32>,
 }

internal/common/enums.rs

@@ -66,6 +66,19 @@ macro_rules! for_each_enums {
                 Center,
             }
 
+            /// This enum describes the how the soft-keyboard auto-capitalization should work for `TextInput`s.
+            /// Currently only supported on Android.
+            enum CapsMode {
+                /// No auto-capitalization
+                None,
+                /// Capitalize the first character of each sentence
+                Sentences,
+                /// capitalize the first character of each word
+                Words,
+                /// Capitalize all characters
+                All,
+            }
+
             /// This enum describes whether an event was rejected or accepted by an event handler.
             enum EventResult {
                 /// The event is rejected by this event handler and may then be handled by the parent item

internal/compiler/builtins.slint

@@ -316,6 +316,7 @@ export component TextInput {
     in property <length> page-height;
     in property <length> text-cursor-width; // StyleMetrics.text-cursor-width  set in apply_default_properties_from_style
     in property <InputType> input-type;
+    in property <CapsMode> caps-mode;
     // Internal, undocumented property, only exposed for tests.
     out property <int> cursor-position_byte-offset;
     // Internal, undocumented property, only exposed for tests.

internal/compiler/widgets/common/lineedit-base.slint

@@ -9,6 +9,7 @@ export component LineEditBase inherits Rectangle {
     in property <bool> enabled <=> text-input.enabled;
     out property <bool> has-focus: text-input.has-focus;
     in property <InputType> input-type <=> text-input.input-type;
+    in property <CapsMode> caps-mode <=> text-input.caps-mode;
     in property <TextHorizontalAlignment> horizontal-alignment <=> text-input.horizontal-alignment;
     in property <bool> read-only <=> text-input.read-only;
     in property <int> font-weight <=> text-input.font-weight;

internal/compiler/widgets/cosmic/lineedit.slint

@@ -7,6 +7,7 @@ import { LineEditBase, LineEditClearIcon, LineEditPasswordIcon } from "../common
 export component LineEdit {
     in property <bool> enabled <=> base.enabled;
     in property <InputType> input-type;
+    in property <CapsMode> caps-mode <=> base.caps-mode;
     in property <TextHorizontalAlignment> horizontal-alignment <=> base.horizontal-alignment;
     in property <bool> read-only <=> base.read-only;
     in property <length> font-size <=> base.font-size;

internal/compiler/widgets/cupertino/lineedit.slint

@@ -8,6 +8,7 @@ import { LineEditBase, LineEditClearIcon, LineEditPasswordIcon } from "../common
 export component LineEdit {
     in property <bool> enabled <=> base.enabled;
     in property <InputType> input-type;
+    in property <CapsMode> caps-mode <=> base.caps-mode;
     in property <TextHorizontalAlignment> horizontal-alignment <=> base.horizontal-alignment;
     in property <bool> read-only <=> base.read-only;
     in property <length> font-size <=> base.font-size;

internal/compiler/widgets/fluent/lineedit.slint

@@ -7,6 +7,7 @@ import { LineEditBase, LineEditClearIcon, LineEditPasswordIcon } from "../common
 export component LineEdit {
     in property <bool> enabled <=> base.enabled;
     in property <InputType> input-type;
+    in property <CapsMode> caps-mode <=> base.caps-mode;
     in property <TextHorizontalAlignment> horizontal-alignment <=> base.horizontal-alignment;
     in property <bool> read-only <=> base.read-only;
     in property <length> font-size <=> base.font-size;

internal/core/items/text.rs

@@ -8,7 +8,7 @@ When adding an item or a property, it needs to be kept in sync with different pl
 Lookup the [`crate::items`] module documentation.
 */
 use super::{
-    EventResult, FontMetrics, InputType, Item, ItemConsts, ItemRc, ItemRef, KeyEventArg,
+    CapsMode, EventResult, FontMetrics, InputType, Item, ItemConsts, ItemRc, ItemRef, KeyEventArg,
     KeyEventResult, KeyEventType, PointArg, PointerEventButton, RenderingResult,
     TextHorizontalAlignment, TextOverflow, TextStrokeStyle, TextVerticalAlignment, TextWrap,
     VoidArg, WindowItem,
@@ -484,6 +484,7 @@ pub struct TextInput {
     pub vertical_alignment: Property<TextVerticalAlignment>,
     pub wrap: Property<TextWrap>,
     pub input_type: Property<InputType>,
+    pub caps_mode: Property<CapsMode>,
     pub letter_spacing: Property<LogicalLength>,
     pub width: Property<LogicalLength>,
     pub height: Property<LogicalLength>,
@@ -1498,6 +1499,7 @@ impl TextInput {
             cursor_rect_size,
             anchor_point,
             input_type: self.input_type(),
+            caps_mode: self.caps_mode(),
         }
     }