From d1a794dcb2c3388bbbd7d197efb81ec6e754e6b5 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Fri, 18 Apr 2014 15:14:36 +0400 Subject: [PATCH] edit line --- examples/example1/src/main.d | 1 + res/editbox_background.xml | 24 ++++ .../editbox_background_focus_yellow.9.png | Bin 0 -> 3425 bytes res/mdpi/editbox_background_normal.9.png | Bin 0 -> 3130 bytes src/dlangui/all.d | 1 + src/dlangui/widgets/controls.d | 6 - src/dlangui/widgets/editors.d | 107 ++++++++++++++++-- src/dlangui/widgets/styles.d | 6 +- 8 files changed, 129 insertions(+), 16 deletions(-) create mode 100644 res/editbox_background.xml create mode 100644 res/mdpi/editbox_background_focus_yellow.9.png create mode 100644 res/mdpi/editbox_background_normal.9.png diff --git a/examples/example1/src/main.d b/examples/example1/src/main.d index ba43def4..bbab036d 100644 --- a/examples/example1/src/main.d +++ b/examples/example1/src/main.d @@ -77,6 +77,7 @@ extern (C) int UIAppMain(string[] args) { hlayout.addChild((new ImageWidget()).drawableId("btn_check").padding(Rect(5,5,5,5)).alignment(Align.Center)); hlayout.addChild((new TextWidget()).text("in horizontal layout")); hlayout.addChild((new ImageWidget()).drawableId("exit").padding(Rect(5,5,5,5)).alignment(Align.Center)); + hlayout.addChild((new EditLine("editline", "Some text to edit"d))); //hlayout.addChild((new Button()).text(">>")); //.textColor(0x40FF4000) hlayout.backgroundColor = 0x8080C0; layout.addChild(hlayout); diff --git a/res/editbox_background.xml b/res/editbox_background.xml new file mode 100644 index 00000000..976a2127 --- /dev/null +++ b/res/editbox_background.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/res/mdpi/editbox_background_focus_yellow.9.png b/res/mdpi/editbox_background_focus_yellow.9.png new file mode 100644 index 0000000000000000000000000000000000000000..faf52ede7ce3b5530c5c0597e56523d2b5d0cac3 GIT binary patch literal 3425 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 start) { + dstring line = i > start ? cast(dstring)(source[start .. i].dup) : ""d; + res ~= line; + } + start = i + 1; + } + } + return res; +} + +/// text content position +struct TextPosition { + /// line number, zero based + int line; + /// character position in line (0 == before first character) + int pos; +} + +/// text content range +struct TextRange { + TextPosition start; + TextPosition end; + /// returns true if range is empty + @property bool empty() { + if (start.line > end.line) + return true; + if (start.line < end.line) + return false; + return (start.pos >= end.pos); + } +} + +/// action performed with editable contents +enum EditAction { + /// insert content into specified position (range.start) + Insert, + /// delete content in range + Delete, + /// replace range content with new content + Replace +} + +/// edit operation details for EditableContent +class EditOperation { + /// action performed + EditAction action; + /// range + TextRange range; + /// new content for range (if required for this action) + dstring[] content; +} + /// editable plain text (multiline) class EditableContent { this(bool multiline) { @@ -30,23 +90,26 @@ class EditableContent { _lines.length = 1; // initial state: single empty line } protected bool _multiline; - protected dchar[][] _lines; + protected dstring[] _lines; /// returns all lines concatenated delimited by '\n' @property dstring text() { if (_lines.length == 0) return ""; + if (_lines.length == 1) + return _lines[0]; + // concat lines dchar[] buf; foreach(item;_lines) { if (buf.length) - buf ~= '\n'; + buf ~= EOL; buf ~= item; } return cast(dstring)buf; } + /// replace whole text with another content @property EditableContent text(dstring newContent) { _lines.length = 0; - // TODO: split into lines - _lines ~= newContent.dup; + _lines = splitDString(newContent); return this; } /// returns line text @@ -56,30 +119,58 @@ class EditableContent { } /// returns line text by index dstring line(int index) { - return _lines[index].dup; + return _lines[index]; } } /// single line editor class EditLine : Widget { EditableContent _content; - this(string ID) { + this(string ID, dstring initialContent = null) { super(ID); _content = new EditableContent(false); + styleId = "EDIT_LINE"; + focusable = true; + text = initialContent; } + /// get widget text override @property dstring text() { return _content.text; } + /// set text override @property Widget text(dstring s) { - _content.text = s; + _content.text = s; requestLayout(); return this; } + /// set text override @property Widget text(ref UIString s) { - _content.text = s; + _content.text = s; requestLayout(); return this; } + + /// measure + override void measure(int parentWidth, int parentHeight) { + FontRef font = font(); + Point sz = font.textSize(text); + measuredContent(parentWidth, parentHeight, sz.x, sz.y); + } + + override void onDraw(DrawBuf buf) { + if (visibility != Visibility.Visible) + return; + super.onDraw(buf); + Rect rc = _pos; + applyMargins(rc); + auto saver = ClipRectSaver(buf, rc); + applyPadding(rc); + FontRef font = font(); + dstring txt = text; + Point sz = font.textSize(txt); + applyAlign(rc, sz); + font.drawText(buf, rc.left, rc.top, txt, textColor); + } } diff --git a/src/dlangui/widgets/styles.d b/src/dlangui/widgets/styles.d index 0d5a8d53..f7d500dc 100644 --- a/src/dlangui/widgets/styles.d +++ b/src/dlangui/widgets/styles.d @@ -646,8 +646,8 @@ Theme createDefaultTheme() { res.createSubstyle("BUTTON_LABEL").layoutWidth(FILL_PARENT).alignment(Align.Left|Align.VCenter); res.createSubstyle("BUTTON_ICON").alignment(Align.Center); res.createSubstyle("TEXT").margins(Rect(2,2,2,2)).padding(Rect(1,1,1,1)); - res.createSubstyle("HSPACER").layoutWidth(FILL_PARENT).layoutWeight(100); - res.createSubstyle("VSPACER").layoutHeight(FILL_PARENT).layoutWeight(100); + res.createSubstyle("HSPACER").layoutWidth(FILL_PARENT).minWidth(5).layoutWeight(100); + res.createSubstyle("VSPACER").layoutHeight(FILL_PARENT).minHeight(5).layoutWeight(100); //button.createState(State.Enabled | State.Focused, State.Focused).backgroundImageId("btn_default_small_normal_disable_focused"); //button.createState(State.Enabled, 0).backgroundImageId("btn_default_small_normal_disable"); //button.createState(State.Pressed, State.Pressed).backgroundImageId("btn_default_small_pressed"); @@ -713,6 +713,8 @@ Theme createDefaultTheme() { //listItem.createState(State.Selected, State.Selected).backgroundColor(0xC04040FF).textColor(0x000000); //listItem.createState(State.Enabled, 0).textColor(0x80000000); // half transparent text for disabled item + Style editLine = res.createSubstyle("EDIT_LINE").backgroundImageId("editbox_background").padding(Rect(4,2,4,2)); + return res; }