forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

theme fixes and editor support fixes for console backend:

This commit is contained in:
Vadim Lopatin 2016-09-09 12:34:56 +03:00
parent 3f6e71390c
commit 50ba103dbc
4 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/example1/src/example1.d
View File

@ -715,7 +715,7 @@ extern (C) int UIAppMain(string[] args) {
combo2.selectedItemIndex = 0;
table.addChild(combo2).layoutWidth(FILL_PARENT);
table.margins(Rect(10,10,10,10)).layoutWidth(FILL_PARENT);
table.margins(Rect(2,2,2,2)).layoutWidth(FILL_PARENT);
tabs.addTab(table, "TAB_TABLE_LAYOUT"c);
//tabs.addTab((new TextWidget()).id("tab5").textColor(0x00802000).text("Tab 5 contents"), "Tab 5"d);

1
src/dlangui/platforms/console/consoleapp.d
View File

@ -380,6 +380,7 @@ class ConsoleDrawBuf : DrawBuf {
// entry point for console app
extern(C) int DLANGUImain(string[] args) {
initLogs();
SCREEN_DPI = 10;
Platform.setInstance(new ConsolePlatform());
FontManager.instance = new ConsoleFontManager();
initResourceManagers();

43
src/dlangui/widgets/editors.d
View File

@ -254,6 +254,10 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
protected uint _leftPaneBackgroundColor2 = 0xFFFFFF;
protected uint _leftPaneBackgroundColor3 = 0xF8F8F8;
protected uint _leftPaneLineNumberColor = 0x4060D0;
protected uint _leftPaneLineNumberColorEdited = 0xC0C000;
protected uint _leftPaneLineNumberColorSaved = 0x00C000;
protected uint _leftPaneLineNumberColorCurrentLine = 0xFFFFFFFF;
protected uint _leftPaneLineNumberBackgroundColorCurrentLine = 0xC08080FF;
protected uint _leftPaneLineNumberBackgroundColor = 0xF4F4F4;
protected uint _colorIconBreakpoint = 0xFF0000;
protected uint _colorIconBookmark = 0x0000FF;
@ -262,9 +266,10 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
protected uint _caretColor = 0x000000;
protected uint _caretColorReplace = 0x808080FF;
protected uint _matchingBracketHightlightColor = 0x60FFE0B0;
protected uint _iconsPaneWidth = 16;
protected uint _foldingPaneWidth = 12;
protected uint _modificationMarksPaneWidth = 4;
protected uint _iconsPaneWidth = BACKEND_CONSOLE ? 1 : 16;
protected uint _foldingPaneWidth = BACKEND_CONSOLE ? 1 : 12;
protected uint _modificationMarksPaneWidth = BACKEND_CONSOLE ? 1 : 4;
/// when true, call measureVisibileText on next layout
protected bool _contentChanged = true;
@ -325,7 +330,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
import std.conv : to;
_iconsWidth = _showIcons ? _iconsPaneWidth : 0;
_foldingWidth = _showFolding ? _foldingPaneWidth : 0;
_modificationMarksWidth = _showModificationMarks ? _modificationMarksPaneWidth : 0;
_modificationMarksWidth = _showModificationMarks && (BACKEND_GUI || !_showLineNumbers) ? _modificationMarksPaneWidth : 0;
_lineNumbersWidth = 0;
if (_showLineNumbers) {
dchar[] s = to!(dchar[])(lineCount + 1);
@ -337,7 +342,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
}
_leftPaneWidth = _lineNumbersWidth + _modificationMarksWidth + _foldingWidth + _iconsWidth;
if (_leftPaneWidth)
_leftPaneWidth += 3;
_leftPaneWidth += BACKEND_CONSOLE ? 1 : 3;
}
protected void drawLeftPaneFolding(DrawBuf buf, Rect rc, int line) {
@ -387,7 +392,10 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
protected void drawLeftPaneLineNumbers(DrawBuf buf, Rect rc, int line) {
import std.conv : to;
buf.fillRect(rc, _leftPaneLineNumberBackgroundColor);
uint bgcolor = _leftPaneLineNumberBackgroundColor;
if (line == _caretPos.line && !isFullyTransparentColor(_leftPaneLineNumberBackgroundColorCurrentLine))
bgcolor = _leftPaneLineNumberBackgroundColorCurrentLine;
buf.fillRect(rc, bgcolor);
if (line < 0)
return;
dstring s = to!dstring(line + 1);
@ -395,7 +403,20 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
Point sz = fnt.textSize(s);
int x = rc.right - sz.x;
int y = rc.top + (rc.height - sz.y) / 2;
fnt.drawText(buf, x, y, s, _leftPaneLineNumberColor);
uint color = _leftPaneLineNumberColor;
if (line == _caretPos.line && !isFullyTransparentColor(_leftPaneLineNumberColorCurrentLine))
color = _leftPaneLineNumberColorCurrentLine;
if (line >= 0 && line < content.length) {
EditStateMark m = content.editMark(line);
if (m == EditStateMark.changed) {
// modified, not saved
color = _leftPaneLineNumberColorEdited;
} else if (m == EditStateMark.saved) {
// modified, saved
color = _leftPaneLineNumberColorSaved;
}
}
fnt.drawText(buf, x, y, s, color);
}
protected bool onLeftPaneMouseClick(MouseEvent event) {
@ -470,7 +491,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
buf.fillRect(rc, _leftPaneBackgroundColor);
//buf.fillRect(Rect(rc.right - 2, rc.top, rc.right - 1, rc.bottom), _leftPaneBackgroundColor2);
//buf.fillRect(Rect(rc.right - 1, rc.top, rc.right - 0, rc.bottom), _leftPaneBackgroundColor3);
rc.right -= 3;
rc.right -= BACKEND_CONSOLE ? 1 : 3;
if (_foldingWidth) {
Rect rc2 = rc;
rc.right = rc2.left = rc2.right - _foldingWidth;
@ -1016,6 +1037,10 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
_leftPaneBackgroundColor2 = style.customColor("editor_left_pane_background2");
_leftPaneBackgroundColor3 = style.customColor("editor_left_pane_background3");
_leftPaneLineNumberColor = style.customColor("editor_left_pane_line_number_text");
_leftPaneLineNumberColorEdited = style.customColor("editor_left_pane_line_number_text_edited", 0xC0C000);
_leftPaneLineNumberColorSaved = style.customColor("editor_left_pane_line_number_text_saved", 0x00C000);
_leftPaneLineNumberColorCurrentLine = style.customColor("editor_left_pane_line_number_text_current_line", 0xFFFFFFFF);
_leftPaneLineNumberBackgroundColorCurrentLine = style.customColor("editor_left_pane_line_number_background_current_line", 0xC08080FF);
_leftPaneLineNumberBackgroundColor = style.customColor("editor_left_pane_line_number_background");
_colorIconBreakpoint = style.customColor("editor_left_pane_line_icon_color_breakpoint", 0xFF0000);
_colorIconBookmark = style.customColor("editor_left_pane_line_icon_color_bookmark", 0x0000FF);
@ -2324,7 +2349,7 @@ class EditBox : EditWidgetBase {
int x0 = i > 0 ? _visibleLinesMeasurement[lineIndex][i - 1] : 0;
int x1 = _visibleLinesMeasurement[lineIndex][i];
int mx = (x0 + x1) >> 1;
if (pt.x < mx) {
if (pt.x <= mx) {
res.pos = i;
return res;
}

37
views/res/console_theme_default.xml
View File

@ -17,14 +17,18 @@
<color id="editor_left_pane_background2" value="#FFFFFFFF"/>
<color id="editor_left_pane_background3" value="FFFFFFFF"/>
<color id="editor_left_pane_line_number_text" value="#808080"/>
<color id="editor_left_pane_line_number_text_edited" value="#FFFF00"/>
<color id="editor_left_pane_line_number_text_saved" value="#00FF00"/>
<color id="editor_left_pane_line_number_text_current_line" value="#FFFFFF"/>
<color id="editor_left_pane_line_number_background" value="#FFFFFFFF"/>
<color id="editor_left_pane_line_number_background_current_line" value="#808080"/>
<color id="editor_left_pane_line_icon_color_breakpoint" value="#0000FF"/>
<color id="editor_left_pane_line_icon_color_bookmark" value="#00FF00"/>
<color id="editor_left_pane_line_icon_color_error" value="#FF0000"/>
<color id="grid_selection_color" value="#808000"/>
<color id="grid_selection_color_row" value="#808000"/>
<color id="grid_cell_background_fixed" value="#808080"/>
<color id="grid_selection_color" value="#008000"/>
<color id="grid_selection_color_row" value="#008000"/>
<color id="grid_cell_background_fixed" value="#FFFFFFFF"/>
<color id="grid_cell_border_color" value="#C0C0C0C0"/>
<color id="grid_cell_border_color_header" value="#C0202020"/>
<color id="grid_cell_background_header" value="#808080"/>
@ -153,6 +157,7 @@
<drawable id="scrollbar_indicator_horizontal" value="scrollbar_indicator_horizontal"/>
<style id="SCROLLBAR"
align="Center"
backgroundImageId="{'░' bc 0x808000 stretch}"
/>
<style id="SCROLLBAR_BUTTON"
backgroundImageId="{' ' bc 0x808000 stretch}"
@ -220,7 +225,7 @@
<style id="TAB_HOST"
layoutWidth="FILL_PARENT"
layoutHeight="FILL_PARENT"
backgroundImageId="{'╔═╗' '║ ║' '╚═╝' bc 0x000080 tc 0xC0C0C0 ninepatch 1 1 1 1 padding 1 1 1 1}"
backgroundColor="#000080"
/>
<style id="TAB_WIDGET"
backgroundColor="#000000"
@ -291,11 +296,13 @@
</style>
<style id="COMBO_BOX"
backgroundImageId="combobox_background"
backgroundImageId="{'┌─┐' '│ │' '└─┘' 0x808080 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 1 1}"
padding="0,0,0,0"
margins="0,0,0,0"
minWidth="8"
/>
>
<state state_focused="true" backgroundImageId="{'┌─┐' '│ │' '└─┘' 0xFFFF00 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 1 1}"/>
</style>
<style id="COMBO_BOX_BODY"
padding="0,0,0,0"
minWidth="8"
@ -309,21 +316,25 @@
/>
<style id="EDIT_LINE"
backgroundImageId="{text:[' '], textColor:[0xC0C0C0], backgroundColor:[0xFFFFFFFF], stretch: true}"
backgroundImageId="{'┌─┐' '│ │' '└─┘' 0x808080 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 1 1}"
padding="0,0,0,0"
margins="0,0,0,0"
minWidth="5"
/>
>
<state state_focused="true" backgroundImageId="{'┌─┐' '│ │' '└─┘' 0xFFFF00 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 1 1}"/>
</style>
<style id="EDIT_BOX"
fontFace="Menlo,Consolas,DejaVuSansMono,Lucida Sans Typewriter,Courier New,Lucida Console"
backgroundImageId="editbox_background"
backgroundImageId="{'┌─┐' '│ │' '└─┘' 0x808080 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 0 0}"
padding="0,0,0,0"
margins="0,0,0,0"
minWidth="8"
minHeight="3"
layoutWidth="FILL_PARENT"
layoutHeight="FILL_PARENT"
/>
>
<state state_focused="true" backgroundImageId="{'┌─┐' '│ │' '└─┘' 0xFFFF00 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 0 0}"/>
</style>
<style id="EDIT_BOX_NO_FRAME"
fontFace="Menlo,Consolas,DejaVuSansMono,Lucida Sans Typewriter,Courier New,Lucida Console"
backgroundColor="#FFFFFF"
@ -335,14 +346,16 @@
layoutHeight="FILL_PARENT"
/>
<style id="STRING_GRID"
backgroundImageId="editbox_background"
padding="0,0,0,0"
margins="0,0,0,0"
minWidth="20"
minHeight="10"
layoutWidth="FILL_PARENT"
layoutHeight="FILL_PARENT"
/>
backgroundImageId="{'┌─┐' '│ │' '└─┘' 0x808080 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 0 0}"
>
<state state_focused="true" backgroundImageId="{'┌─┐' '│ │' '└─┘' 0xFFFF00 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 0 0}"/>
</style>
<style id="STATUS_LINE"
backgroundColor="#D0D0D0"
layoutWidth="FILL_PARENT"