From 8781d57f5907da58d8cd5d806f64fa04ddc19de9 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Sat, 17 Jan 2015 22:10:56 +0300 Subject: [PATCH] fix editor --- src/dlangide/ui/frame.d | 32 +++++++++++++++++++++----------- src/dlangide/ui/wspanel.d | 4 ++-- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d index 99b9560..3671fa0 100644 --- a/src/dlangide/ui/frame.d +++ b/src/dlangide/ui/frame.d @@ -17,7 +17,23 @@ import dlangide.workspace.workspace; import std.conv; - +class SourceEdit : EditBox { + this(string ID) { + super(ID); + styleId = null; + fontFamily = FontFamily.MonoSpace; + fontFace = "Consolas Bold,Consolas,Courier New"; + fontSize = 20; + fontWeight = 800; + backgroundColor = 0xFFFFFF; + layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT); + minFontSize(12).maxFontSize(75); // allow font zoom with Ctrl + MouseWheel + //focusable = true; + } + this() { + this("SRCEDIT"); + } +} class IDEFrame : AppFrame { @@ -51,20 +67,14 @@ class IDEFrame : AppFrame { //VerticalLayout editors = new VerticalLayout("editors"); //editors.layoutWidth = FILL_PARENT; //editors.layoutHeight = FILL_PARENT; - EditBox editBox = new EditBox("editbox1", "Some text\nSecond line\nYet another line\n\n\tforeach(s;lines);\n\t\twriteln(s);\n"d); - editBox.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT); - editBox.minFontSize(12).maxFontSize(75); // allow font zoom with Ctrl + MouseWheel - editBox.fontFamily = FontFamily.MonoSpace; - editBox.focusable = true; + EditBox editBox = new SourceEdit("editbox1"); + editBox.text = "Some text\nSecond line\nYet another line\n\n\tforeach(s;lines);\n\t\twriteln(s);\n"d; //editors.addChild(editBox); //editBox.popupMenu = editPopupItem; tabs.addTab(editBox, "Sample"d); - EditBox editBox2 = new EditBox("editboxw", "Second tab editor"d); - editBox2.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT); - editBox2.minFontSize(12).maxFontSize(75); // allow font zoom with Ctrl + MouseWheel - editBox2.fontFamily = FontFamily.MonoSpace; - editBox2.focusable = true; + EditBox editBox2 = new SourceEdit("editbox2"); + editBox2.text = "Second tab editor\n\nBlah Blah."d; //editors.addChild(editBox); //editBox.popupMenu = editPopupItem; tabs.addTab(editBox2, "Sample text 2"d); diff --git a/src/dlangide/ui/wspanel.d b/src/dlangide/ui/wspanel.d index 0bc673b..e00c5f2 100644 --- a/src/dlangide/ui/wspanel.d +++ b/src/dlangide/ui/wspanel.d @@ -11,13 +11,13 @@ class WorkspacePanel : DockWindow { this(string id) { super(id); workspace = null; - layoutWidth = 200; + //layoutWidth = 200; _caption.text = "Workspace Explorer"d; } override protected Widget createBodyWidget() { _tree = new TreeWidget("wstree"); - _tree.layoutHeight = FILL_PARENT; + _tree.layoutHeight(FILL_PARENT).layoutHeight(FILL_PARENT); return _tree; }