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

console mode support fixes

This commit is contained in:
Vadim Lopatin 2016-09-13 10:33:33 +03:00
parent d3a4f7df02
commit 969148ad26
14 changed files with 113 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/helloworld/helloworld-msvc.visualdproj
View File

@ -412,7 +412,7 @@
<obj>0</obj> <obj>0</obj>
<link>0</link> <link>0</link>
<lib>0</lib> <lib>0</lib>
<subsystem>2</subsystem> <subsystem>1</subsystem>
<multiobj>0</multiobj> <multiobj>0</multiobj>
<singleFileCompilation>0</singleFileCompilation> <singleFileCompilation>0</singleFileCompilation>
<oneobj>0</oneobj> <oneobj>0</oneobj>
@ -441,7 +441,7 @@
<useArrayBounds>0</useArrayBounds> <useArrayBounds>0</useArrayBounds>
<noboundscheck>0</noboundscheck> <noboundscheck>0</noboundscheck>
<useSwitchError>0</useSwitchError> <useSwitchError>0</useSwitchError>
<useUnitTests>1</useUnitTests> <useUnitTests>0</useUnitTests>
<useInline>0</useInline> <useInline>0</useInline>
<release>0</release> <release>0</release>
<preservePaths>0</preservePaths> <preservePaths>0</preservePaths>
@ -452,7 +452,7 @@
<pic>0</pic> <pic>0</pic>
<cov>0</cov> <cov>0</cov>
<nofloat>0</nofloat> <nofloat>0</nofloat>
<Dversion>2.043</Dversion> <Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas> <ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst> <allinst>0</allinst>
<stackStomp>0</stackStomp> <stackStomp>0</stackStomp>
@ -480,7 +480,7 @@
<debuglevel>0</debuglevel> <debuglevel>0</debuglevel>
<debugids /> <debugids />
<versionlevel>0</versionlevel> <versionlevel>0</versionlevel>
<versionids>EmbedStandardResources</versionids> <versionids>USE_CONSOLE EmbedStandardResources ForceLogs</versionids>
<dump_source>0</dump_source> <dump_source>0</dump_source>
<mapverbosity>0</mapverbosity> <mapverbosity>0</mapverbosity>
<createImplib>0</createImplib> <createImplib>0</createImplib>
@ -514,7 +514,7 @@
<obj>0</obj> <obj>0</obj>
<link>0</link> <link>0</link>
<lib>0</lib> <lib>0</lib>
<subsystem>2</subsystem> <subsystem>1</subsystem>
<multiobj>0</multiobj> <multiobj>0</multiobj>
<singleFileCompilation>0</singleFileCompilation> <singleFileCompilation>0</singleFileCompilation>
<oneobj>0</oneobj> <oneobj>0</oneobj>
@ -554,7 +554,7 @@
<pic>0</pic> <pic>0</pic>
<cov>0</cov> <cov>0</cov>
<nofloat>0</nofloat> <nofloat>0</nofloat>
<Dversion>2.043</Dversion> <Dversion>2</Dversion>
<ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas> <ignoreUnsupportedPragmas>0</ignoreUnsupportedPragmas>
<allinst>0</allinst> <allinst>0</allinst>
<stackStomp>0</stackStomp> <stackStomp>0</stackStomp>
@ -582,7 +582,7 @@
<debuglevel>0</debuglevel> <debuglevel>0</debuglevel>
<debugids /> <debugids />
<versionlevel>0</versionlevel> <versionlevel>0</versionlevel>
<versionids>EmbedStandardResources</versionids> <versionids>USE_CONSOLE</versionids>
<dump_source>0</dump_source> <dump_source>0</dump_source>
<mapverbosity>0</mapverbosity> <mapverbosity>0</mapverbosity>
<createImplib>0</createImplib> <createImplib>0</createImplib>

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

@ -8,7 +8,7 @@ mixin APP_ENTRY_POINT;
extern (C) int UIAppMain(string[] args) { extern (C) int UIAppMain(string[] args) {
// load theme from file "theme_default.xml" // load theme from file "theme_default.xml"
Platform.instance.uiTheme = "theme_default"; //Platform.instance.uiTheme = "theme_default";
// create window // create window
Log.d("Creating window"); Log.d("Creating window");

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

@ -386,6 +386,8 @@ extern(C) int DLANGUImain(string[] args) {
initResourceManagers(); initResourceManagers();
currentTheme = createDefaultTheme(); currentTheme = createDefaultTheme();
Platform.instance.uiTheme = "theme_default";
Log.i("Entering UIAppMain: ", args); Log.i("Entering UIAppMain: ", args);
int result = -1; int result = -1;
try { try {

57
src/dlangui/platforms/console/consolefont.d
View File

@ -147,7 +147,7 @@ class ConsoleFont : Font {
int underlineY = y + _baseline + underlineHeight * 2; int underlineY = y + _baseline + underlineHeight * 2;
buf.console.textColor = ConsoleDrawBuf.toConsoleColor(color); buf.console.textColor = ConsoleDrawBuf.toConsoleColor(color);
buf.console.backgroundColor = CONSOLE_TRANSPARENT_BACKGROUND; buf.console.backgroundColor = CONSOLE_TRANSPARENT_BACKGROUND;
Log.d("drawText: (", x, ',', y, ") '", text, "', color=", buf.console.textColor); //Log.d("drawText: (", x, ',', y, ") '", text, "', color=", buf.console.textColor);
foreach(int i; 0 .. charsMeasured) { foreach(int i; 0 .. charsMeasured) {
dchar ch = text[i]; dchar ch = text[i];
if (ch == '&' && (textFlags & (TextFlag.UnderlineHotKeys | TextFlag.HotKeys | TextFlag.UnderlineHotKeysWhenAltPressed))) { if (ch == '&' && (textFlags & (TextFlag.UnderlineHotKeys | TextFlag.HotKeys | TextFlag.UnderlineHotKeysWhenAltPressed))) {
@ -156,17 +156,14 @@ class ConsoleFont : Font {
continue; // skip '&' in hot key when measuring continue; // skip '&' in hot key when measuring
} }
int xx = (i > 0) ? _textSizeBuffer[i - 1] : 0; int xx = (i > 0) ? _textSizeBuffer[i - 1] : 0;
if (x + xx > clip.right) if (x + xx >= clip.right)
break; break;
if (x + xx + 255 < clip.left) if (x + xx < clip.left)
continue; // far at left of clipping region continue; // far at left of clipping region
if (underline) { if (underline) {
//int xx2 = _textSizeBuffer[i];
// draw underline // draw underline
buf.console.underline = true; buf.console.underline = true;
//if (xx2 > xx)
// buf.fillRect(Rect(x + xx, underlineY, x + xx2, underlineY + underlineHeight), color);
// turn off underline after hot key // turn off underline after hot key
if (!(textFlags & TextFlag.Underline)) { if (!(textFlags & TextFlag.Underline)) {
underline = false; underline = false;
@ -177,7 +174,7 @@ class ConsoleFont : Font {
if (ch == ' ' || ch == '\t') if (ch == ' ' || ch == '\t')
continue; continue;
int gx = x + xx; int gx = x + xx;
if (gx + 1 < clip.left) if (gx < clip.left)
continue; continue;
buf.console.setCursor(gx, y); buf.console.setCursor(gx, y);
buf.console.writeText(cast(dstring)(text[i .. i + 1])); buf.console.writeText(cast(dstring)(text[i .. i + 1]));
@ -198,9 +195,14 @@ class ConsoleFont : Font {
* tabOffset = when string is drawn not from left position, use to move tab stops left/right * tabOffset = when string is drawn not from left position, use to move tab stops left/right
* textFlags = set of TextFlag bit fields * textFlags = set of TextFlag bit fields
****************************************************************************************/ ****************************************************************************************/
override void drawColoredText(DrawBuf buf, int x, int y, const dchar[] text, const CustomCharProps[] charProps, int tabSize = 4, int tabOffset = 0, uint textFlags = 0) { override void drawColoredText(DrawBuf drawBuf, int x, int y, const dchar[] text, const CustomCharProps[] charProps, int tabSize = 4, int tabOffset = 0, uint textFlags = 0) {
if (text.length == 0) if (text.length == 0)
return; // nothing to draw - empty text return; // nothing to draw - empty text
import dlangui.platforms.console.consoleapp;
import dlangui.platforms.console.dconsole;
ConsoleDrawBuf buf = cast(ConsoleDrawBuf)drawBuf;
if (_textSizeBuffer.length < text.length) if (_textSizeBuffer.length < text.length)
_textSizeBuffer.length = text.length; _textSizeBuffer.length = text.length;
int charsMeasured = measureText(text, _textSizeBuffer, MAX_WIDTH_UNSPECIFIED, tabSize, tabOffset, textFlags); int charsMeasured = measureText(text, _textSizeBuffer, MAX_WIDTH_UNSPECIFIED, tabSize, tabOffset, textFlags);
@ -214,47 +216,48 @@ class ConsoleFont : Font {
bool underline = (customizedTextFlags & TextFlag.Underline) != 0; bool underline = (customizedTextFlags & TextFlag.Underline) != 0;
int underlineHeight = 1; int underlineHeight = 1;
int underlineY = y + _baseline + underlineHeight * 2; int underlineY = y + _baseline + underlineHeight * 2;
buf.console.backgroundColor = CONSOLE_TRANSPARENT_BACKGROUND;
foreach(int i; 0 .. charsMeasured) { foreach(int i; 0 .. charsMeasured) {
dchar ch = text[i]; dchar ch = text[i];
uint color = i < charProps.length ? charProps[i].color : charProps[$ - 1].color; uint color = i < charProps.length ? charProps[i].color : charProps[$ - 1].color;
buf.console.textColor = ConsoleDrawBuf.toConsoleColor(color);
customizedTextFlags = (i < charProps.length ? charProps[i].textFlags : charProps[$ - 1].textFlags) | textFlags; customizedTextFlags = (i < charProps.length ? charProps[i].textFlags : charProps[$ - 1].textFlags) | textFlags;
underline = (customizedTextFlags & TextFlag.Underline) != 0; underline = (customizedTextFlags & TextFlag.Underline) != 0;
// turn off underline after hot key // turn off underline after hot key
if (ch == '&' && (textFlags & (TextFlag.UnderlineHotKeys | TextFlag.HotKeys | TextFlag.UnderlineHotKeysWhenAltPressed))) { if (ch == '&' && (textFlags & (TextFlag.UnderlineHotKeys | TextFlag.HotKeys | TextFlag.UnderlineHotKeysWhenAltPressed))) {
if (textFlags & (TextFlag.UnderlineHotKeys | TextFlag.UnderlineHotKeysWhenAltPressed)) // draw underline
underline = true; // turn ON underline for hot key buf.console.underline = true;
// turn off underline after hot key
if (!(textFlags & TextFlag.Underline)) {
underline = false;
buf.console.underline = false;
}
continue; // skip '&' in hot key when measuring continue; // skip '&' in hot key when measuring
} }
int xx = (i > 0) ? _textSizeBuffer[i - 1] : 0; int xx = (i > 0) ? _textSizeBuffer[i - 1] : 0;
if (x + xx > clip.right) if (x + xx >= clip.right)
break; break;
if (x + xx + 255 < clip.left) if (x + xx < clip.left)
continue; // far at left of clipping region continue; // far at left of clipping region
if (underline) { if (underline) {
int xx2 = _textSizeBuffer[i];
// draw underline // draw underline
if (xx2 > xx) buf.console.underline = true;
buf.fillRect(Rect(x + xx, underlineY, x + xx2, underlineY + underlineHeight), color);
// turn off underline after hot key // turn off underline after hot key
if (!(customizedTextFlags & TextFlag.Underline)) if (!(customizedTextFlags & TextFlag.Underline)) {
underline = false; underline = false;
buf.console.underline = false;
}
} }
if (ch == ' ' || ch == '\t') if (ch == ' ' || ch == '\t')
continue; continue;
Glyph * glyph = getCharGlyph(ch);
if (glyph is null) int gx = x + xx;
if (gx < clip.left)
continue; continue;
if ( glyph.blackBoxX && glyph.blackBoxY ) { buf.console.setCursor(gx, y);
int gx = x + xx + glyph.originX; buf.console.writeText(cast(dstring)(text[i .. i + 1]));
if (gx + glyph.correctedBlackBoxX < clip.left)
continue;
buf.drawGlyph( gx,
y + _baseline - glyph.originY,
glyph,
color);
}
} }
} }

2
src/dlangui/widgets/combobox.d
View File

@ -90,7 +90,7 @@ class ComboBoxBase : HorizontalLayout, OnClickHandler {
} }
protected ImageButton createButton() { protected ImageButton createButton() {
ImageButton res = new ImageButton("COMBOBOX_BUTTON", "scrollbar_btn_down"); ImageButton res = new ImageButton("COMBOBOX_BUTTON", ATTR_SCROLLBAR_BUTTON_DOWN);
res.styleId = STYLE_COMBO_BOX_BUTTON; res.styleId = STYLE_COMBO_BOX_BUTTON;
res.layoutWeight = 0; res.layoutWeight = 0;
res.click = this; res.click = this;

2
src/dlangui/widgets/tree.d
View File

@ -608,7 +608,7 @@ class TreeItemWidget : HorizontalLayout {
_label = new TextWidget("label", _item.text); _label = new TextWidget("label", _item.text);
_label.styleId = STYLE_TREE_ITEM_LABEL; _label.styleId = STYLE_TREE_ITEM_LABEL;
_label.setState(State.Parent); _label.setState(State.Parent);
_label.padding(Rect(5, 0, 0, 0)); _label.padding(Rect(BACKEND_GUI ? 5 : 0, 0, 0, 0));
_body.addChild(_label); _body.addChild(_label);
// append children // append children
addChild(_tab); addChild(_tab);

6
views/console_standard_resources.list
View File

@ -1,12 +1,6 @@
res/i18n/std_en.ini res/i18n/std_en.ini
res/i18n/std_ru.ini res/i18n/std_ru.ini
res/console_theme_default.xml res/console_theme_default.xml
res/scrollbar_btn_left.tim
res/scrollbar_btn_right.tim
res/scrollbar_btn_up.tim
res/scrollbar_btn_down.tim
res/scrollbar_indicator_horizontal.tim
res/scrollbar_indicator_vertical.tim
res/btn_check.xml res/btn_check.xml
res/btn_check_on.tim res/btn_check_on.tim
res/btn_check_on_pressed.tim res/btn_check_on_pressed.tim

134
views/res/console_theme_default.xml
View File

@ -6,8 +6,8 @@
textColor="#C0C0C0" textColor="#C0C0C0"
> >
<color id="window_background" value="#000000"/> <color id="window_background" value="#000000"/>
<color id="dialog_background" value="#EEEEEE"/> <color id="dialog_background" value="#000000"/>
<color id="edit_background" value="#FFFFFF"/> <color id="edit_background" value="#000000"/>
<color id="edit_caret" value="#000000"/> <color id="edit_caret" value="#000000"/>
<color id="edit_caret_replace" value="#000000"/> <color id="edit_caret_replace" value="#000000"/>
<color id="editor_matching_bracket_highlight" value="#800000"/> <color id="editor_matching_bracket_highlight" value="#800000"/>
@ -22,9 +22,9 @@
<color id="editor_left_pane_line_number_text_current_line" value="#FFFFFF"/> <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" value="#FFFFFFFF"/>
<color id="editor_left_pane_line_number_background_current_line" value="#808080"/> <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_breakpoint" value="#FF0000"/>
<color id="editor_left_pane_line_icon_color_bookmark" value="#00FF00"/> <color id="editor_left_pane_line_icon_color_bookmark" value="#00FF00"/>
<color id="editor_left_pane_line_icon_color_error" value="#FF0000"/> <color id="editor_left_pane_line_icon_color_error" value="#800000"/>
<color id="grid_selection_color" value="#008000"/> <color id="grid_selection_color" value="#008000"/>
<color id="grid_selection_color_row" value="#008000"/> <color id="grid_selection_color_row" value="#008000"/>
@ -34,6 +34,17 @@
<color id="grid_cell_background_header" value="#808080"/> <color id="grid_cell_background_header" value="#808080"/>
<color id="grid_cell_background_header_selected" value="#008000"/> <color id="grid_cell_background_header_selected" value="#008000"/>
<drawable id="arrow_right_down_black" value="{'▼ ' #008000}"/>
<drawable id="arrow_right_hollow" value="{'► ' #008000}"/>
<drawable id="btn_check" value="btn_check"/>
<drawable id="btn_radio" value="btn_radio"/>
<drawable id="scrollbar_button_up" value="{'▲' #FFFF00}"/>
<drawable id="scrollbar_button_down" value="{'▼' #FFFF00}"/>
<drawable id="scrollbar_button_left" value="{'◄' #FFFF00}"/>
<drawable id="scrollbar_button_right" value="{'►' #FFFF00}"/>
<drawable id="scrollbar_indicator_vertical" value="{'' #FFFF00}"/>
<drawable id="scrollbar_indicator_horizontal" value="{'' #FFFF00}"/>
<style id="BUTTON" <style id="BUTTON"
backgroundImageId="{'▄' ' ' '▀' tc 0x808080 bc 0xFFFFFFFF 0x808080 0xFFFFFFFF ninepatch 0 1 0 1 padding 1 1 1 1}" backgroundImageId="{'▄' ' ' '▀' tc 0x808080 bc 0xFFFFFFFF 0x808080 0xFFFFFFFF ninepatch 0 1 0 1 padding 1 1 1 1}"
align="Center" align="Center"
@ -143,30 +154,19 @@
backgroundImageId="btn_background" backgroundImageId="btn_background"
align="Center" align="Center"
/> />
<color id="sample_color_rgb" value="#8CF"/>
<color id="sample_color_argb" value="#48CF"/>
<color id="sample_color_rrggbb" value="#80C0F0"/>
<color id="sample_color_aarrggbb" value="#4080C0F0"/>
<drawable id="btn_check" value="btn_check"/>
<drawable id="btn_radio" value="btn_radio"/>
<drawable id="scrollbar_button_up" value="scrollbar_btn_up"/>
<drawable id="scrollbar_button_down" value="scrollbar_btn_down"/>
<drawable id="scrollbar_button_left" value="scrollbar_btn_left"/>
<drawable id="scrollbar_button_right" value="scrollbar_btn_right"/>
<drawable id="scrollbar_indicator_vertical" value="scrollbar_indicator_vertical"/>
<drawable id="scrollbar_indicator_horizontal" value="scrollbar_indicator_horizontal"/>
<style id="SCROLLBAR" <style id="SCROLLBAR"
align="Center" align="Center"
backgroundImageId="{'░' bc 0x808000 stretch}" backgroundImageId="{'░' 0x808000 stretch}"
/> />
<style id="SCROLLBAR_BUTTON" <style id="SCROLLBAR_BUTTON"
backgroundImageId="{' ' bc 0x808000 stretch}" backgroundImageId="{' ' bc 0x808000 stretch}"
align="Center" align="Center"
> >
<state state_pressed="true" backgroundImageId="{' ' bc 0x808080 stretch}"/> <state state_pressed="true" backgroundImageId="{' ' bc 0xFFFF00 stretch}"/>
</style> </style>
<style id="SCROLLBAR_BUTTON_TRANSPARENT" <style id="SCROLLBAR_BUTTON_TRANSPARENT"
backgroundImageId="{' ' stretch}" backgroundImageId="{'░' 0x808000 stretch}"
align="Center" align="Center"
/> />
<style id="SLIDER" <style id="SLIDER"
@ -177,19 +177,8 @@
<state state_pressed="true" backgroundImageId="{'░' 0x808080 stretch}"/> <state state_pressed="true" backgroundImageId="{'░' 0x808080 stretch}"/>
<state state_hovered="true" backgroundImageId="{'░' 0x808000 stretch}"/> <state state_hovered="true" backgroundImageId="{'░' 0x808000 stretch}"/>
</style> </style>
<style id="TAB_DOWN_DARK"
backgroundImageId="dock_window_caption_background_down"
layoutWidth="FILL_PARENT"
>
</style>
<style id="TAB_DOWN_BUTTON_DARK"
padding="1,0,1,0"
backgroundImageId="tab_btn_dark_down"
/>
<style id="TAB_UP_DARK" <style id="TAB_UP_DARK"
layoutWidth="FILL_PARENT" layoutWidth="FILL_PARENT"
margins="1,0,1,0"
backgroundColor="#000000" backgroundColor="#000000"
> >
</style> </style>
@ -202,11 +191,18 @@
<style id="TAB_UP_BUTTON_TEXT_DARK" <style id="TAB_UP_BUTTON_TEXT_DARK"
textColor="#808080" textColor="#808080"
align="Center" align="Center"
margins="1,0,1,0" padding="1,0,1,0"
> >
<state state_selected="true" textColor="#FFFFFF"/> <state state_selected="true" textColor="#FFFFFF"/>
<state state_hovered="true" textColor="#808000"/> <state state_hovered="true" textColor="#808000"/>
</style> </style>
<style id="TAB_DOWN_DARK" parent="TAB_UP_DARK"
>
</style>
<style id="TAB_DOWN_BUTTON_DARK" parent="TAB_UP_BUTTON_DARK"
/>
<style id="TAB_UP" <style id="TAB_UP"
layoutWidth="FILL_PARENT" layoutWidth="FILL_PARENT"
margins="2,0,2,0" margins="2,0,2,0"
@ -220,6 +216,7 @@
<state state_selected="true" textColor="#FFFFFF"/> <state state_selected="true" textColor="#FFFFFF"/>
<state state_hovered="true" textColor="#808000"/> <state state_hovered="true" textColor="#808000"/>
</style> </style>
<style id="TAB_UP_BUTTON" <style id="TAB_UP_BUTTON"
backgroundColor="#000000" backgroundColor="#000000"
> >
@ -320,7 +317,7 @@
<style id="EDIT_LINE" <style id="EDIT_LINE"
backgroundImageId="{'┌─┐' '│ │' '└─┘' 0x808080 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 1 1}" backgroundImageId="{'┌─┐' '│ │' '└─┘' 0x808080 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 1 1}"
padding="0,0,0,0" padding="1,1,1,1"
margins="0,0,0,0" margins="0,0,0,0"
minWidth="5" minWidth="5"
> >
@ -329,18 +326,20 @@
<style id="EDIT_BOX" <style id="EDIT_BOX"
fontFace="Menlo,Consolas,DejaVuSansMono,Lucida Sans Typewriter,Courier New,Lucida Console" fontFace="Menlo,Consolas,DejaVuSansMono,Lucida Sans Typewriter,Courier New,Lucida Console"
backgroundImageId="{'┌─┐' '│ │' '└─┘' 0x808080 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 0 0}" backgroundImageId="{'┌─┐' '│ │' '└─┘' 0x808080 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 0 0}"
padding="0,0,0,0" padding="1,1,0,0"
margins="0,0,0,0" margins="0,0,0,0"
minWidth="8" minWidth="8"
minHeight="3" minHeight="3"
layoutWidth="FILL_PARENT" layoutWidth="FILL_PARENT"
layoutHeight="FILL_PARENT" layoutHeight="FILL_PARENT"
> >
<state state_focused="true" state_window_focused="true" backgroundImageId="{'┌─┐' '│ │' '└─┘' 0xFFFF00 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}"/> <state state_focused="true" backgroundImageId="{'┌─┐' '│ │' '└─┘' 0xFFFF00 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 0 0}"/>
<state state_enabled="true" backgroundImageId="{'┌─┐' '│ │' '└─┘' 0x808080 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 0 0}"/>
</style> </style>
<style id="EDIT_BOX_NO_FRAME" <style id="EDIT_BOX_NO_FRAME"
fontFace="Menlo,Consolas,DejaVuSansMono,Lucida Sans Typewriter,Courier New,Lucida Console" fontFace="Menlo,Consolas,DejaVuSansMono,Lucida Sans Typewriter,Courier New,Lucida Console"
backgroundColor="#FFFFFF" backgroundColor="#000000"
padding="0,0,0,0" padding="0,0,0,0"
margins="0,0,0,0" margins="0,0,0,0"
minWidth="8" minWidth="8"
@ -367,7 +366,7 @@
layoutWeight="0" layoutWeight="0"
/> />
<style id="DOCK_HOST" <style id="DOCK_HOST"
backgroundColor="#eceffa" backgroundColor="#000000"
layoutWidth="FILL_PARENT" layoutWidth="FILL_PARENT"
layoutHeight="FILL_PARENT" layoutHeight="FILL_PARENT"
padding="0,0,0,0" padding="0,0,0,0"
@ -378,13 +377,6 @@
padding="0,0,0,0" padding="0,0,0,0"
margins="0,0,0,0" margins="0,0,0,0"
/> />
<style id="DOCK_WINDOW"
backgroundColor="#000000"
layoutWidth="FILL_PARENT"
layoutHeight="FILL_PARENT"
padding="0,0,0,0"
margins="0,0,0,0"
/>
<style id="FLOATING_WINDOW" <style id="FLOATING_WINDOW"
backgroundImageId="{'╔═╗' '║ ║' '╚═╝' bc 0x000000 tc 0xC0C0C0 ninepatch 1 1 1 1 padding 2 1 2 1}" backgroundImageId="{'╔═╗' '║ ║' '╚═╝' bc 0x000000 tc 0xC0C0C0 ninepatch 1 1 1 1 padding 2 1 2 1}"
layoutWidth="FILL_PARENT" layoutWidth="FILL_PARENT"
@ -392,23 +384,36 @@
padding="0,0,0,0" padding="0,0,0,0"
margins="0,0,0,0" margins="0,0,0,0"
/> />
<style id="DOCK_WINDOW"
backgroundColor="#000000"
layoutWidth="FILL_PARENT"
layoutHeight="FILL_PARENT"
padding="0,0,0,0"
margins="0,0,0,0"
/>
<style id="DOCK_WINDOW_CAPTION" <style id="DOCK_WINDOW_CAPTION"
backgroundColor="#008000" backgroundColor="#008000"
textColor="#000080"
layoutWidth="FILL_PARENT" layoutWidth="FILL_PARENT"
layoutHeight="WRAP_CONTENT" layoutHeight="WRAP_CONTENT"
padding="0,0,0,1" padding="0,0,0,0"
/> >
<state state_window_focused="true" backgroundColor="#0000FF"/>
</style>
<style id="DOCK_WINDOW_CAPTION_LABEL" <style id="DOCK_WINDOW_CAPTION_LABEL"
textColor="#FFFFFF" textColor="#FFFFFF"
layoutWidth="FILL_PARENT" layoutWidth="FILL_PARENT"
layoutHeight="WRAP_CONTENT" layoutHeight="WRAP_CONTENT"
padding="0,0,0,0" padding="0,0,0,0"
align="Left|VCenter" align="Left|VCenter"
/> >
<state state_window_focused="true" textColor="#FFFFFF"/>
</style>
<style id="DOCK_WINDOW_BODY" <style id="DOCK_WINDOW_BODY"
layoutWidth="FILL_PARENT" layoutWidth="FILL_PARENT"
layoutHeight="FILL_PARENT" layoutHeight="FILL_PARENT"
padding="0,0,0,0" padding="0,0,0,0"
backgroundColor="#000000"
/> />
<style id="TOOLBAR_HOST" <style id="TOOLBAR_HOST"
@ -426,29 +431,30 @@
textColor="#404040" textColor="#404040"
/> />
<style id="TOOLBAR" <style id="TOOLBAR"
backgroundImageId="toolbar_background" backgroundColor="#000000"
layoutWidth="WRAP_CONTENT" layoutWidth="WRAP_CONTENT"
layoutHeight="WRAP_CONTENT" layoutHeight="WRAP_CONTENT"
margins="1,0,1,0" margins="1,0,1,0"
minHeight="3" minHeight="3"
/> />
<style id="TOOLBAR_BUTTON" <style id="TOOLBAR_BUTTON"
backgroundImageId="btn_background"
align="Center" align="Center"
margins="0,0,0,0" margins="0,0,0,0"
padding="0,0,0,0" padding="0,0,0,0"
backgroundImageId="{'┌─┐' '│ │' '└─┘' 0x808000 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 1 1}"
> >
<state state_enabled="false" alpha="160" backgroundImageId="@null"/> <state state_enabled="true" state_hover="true" backgroundImageId="{'┌─┐' '│ │' '└─┘' 0xFFFF00 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 1 1}"/>
</style> </style>
<style id="TOOLBAR_CONTROL" <style id="TOOLBAR_CONTROL"
backgroundColor="#000000"
align="Center" align="Center"
margins="0,0,0,0" margins="0,0,0,0"
padding="0,0,0,0" padding="0,0,0,0"
backgroundImageId="{'┌─┐' '│ │' '└─┘' 0x808000 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 1 1}"
> >
<state state_enabled="false" alpha="160" backgroundImageId="@null"/> <state state_enabled="true" state_hover="true" backgroundImageId="{'┌─┐' '│ │' '└─┘' 0xFFFF00 bc 0xFFFFFFFF ninepatch 1 1 1 1 padding 1 1 1 1}"/>
</style> </style>
<style id="TOOLBAR_SEPARATOR" <style id="TOOLBAR_SEPARATOR"
backgroundImageId="{' ' 0x808080 padding 1 1 1 1}"
align="Center" align="Center"
/> />
@ -466,8 +472,9 @@
<style id="TREE_ITEM_BODY" <style id="TREE_ITEM_BODY"
align="Left|VCenter" align="Left|VCenter"
textFlags="Parent" textFlags="Parent"
backgroundImageId="list_item_background" >
/> <state state_selected="true" backgroundColor="#808080"/>
</style>
<style id="TREE_ITEM_ICON" <style id="TREE_ITEM_ICON"
align="Left|VCenter" align="Left|VCenter"
textFlags="Parent" textFlags="Parent"
@ -478,6 +485,8 @@
align="Left|VCenter" align="Left|VCenter"
textFlags="Parent" textFlags="Parent"
> >
<state state_selected="true" textColor="#FFFFFF"/>
<state state_hover="true" textColor="#FFFF00"/>
<state state_default="true" fontWeight="bold"/> <state state_default="true" fontWeight="bold"/>
</style> </style>
@ -496,7 +505,6 @@
<style id="SETTINGS_PAGE_TITLE" <style id="SETTINGS_PAGE_TITLE"
margins="1,1,1,2" margins="1,1,1,2"
fontSize="120%"
layoutWeight="0" layoutWeight="0"
layoutWidth="FILL_PARENT" layoutWidth="FILL_PARENT"
/> />
@ -506,22 +514,22 @@
layoutHeight="WRAP_CONTENT" layoutHeight="WRAP_CONTENT"
minHeight="1" minHeight="1"
maxHeight="1" maxHeight="1"
backgroundColor="#E0E0E0"> backgroundColor="#FFFFFFFF">
<state state_focused="true" backgroundColor="#40C0C000"/> <state state_focused="true" backgroundColor="#FF00FF"/>
<state state_pressed="true" backgroundColor="#4080C000"/> <state state_pressed="true" backgroundColor="#FFFF00"/>
<state state_selected="true" backgroundColor="#00F8F9Fa"/> <state state_selected="true" backgroundColor="#808080"/>
<state state_hovered="true" backgroundColor="#C0FFFF00"/> <state state_hovered="true" backgroundColor="#808000"/>
</style> </style>
<style id="RESIZER_HORIZONTAL" <style id="RESIZER_HORIZONTAL"
layoutWidth="FILL_PARENT" layoutWidth="FILL_PARENT"
layoutHeight="WRAP_CONTENT" layoutHeight="WRAP_CONTENT"
minWidth="1" minWidth="1"
maxWidth="1" maxWidth="1"
backgroundColor="#E0E0E0"> backgroundColor="#FFFFFFFF">
<state state_focused="true" backgroundColor="#40C0C000"/> <state state_focused="true" backgroundColor="#FF00FF"/>
<state state_pressed="true" backgroundColor="#4080C000"/> <state state_pressed="true" backgroundColor="#FFFF00"/>
<state state_selected="true" backgroundColor="#00F8F9Fa"/> <state state_selected="true" backgroundColor="#808080"/>
<state state_hovered="true" backgroundColor="#C0FFFF00"/> <state state_hovered="true" backgroundColor="#808000"/>
</style> </style>
</theme> </theme>

6
views/res/scrollbar_btn_down.tim
View File

@ -1,6 +0,0 @@
{
text: [
"▼"
],
textColor: [0xFFFF00],
}

6
views/res/scrollbar_btn_left.tim
View File

@ -1,6 +0,0 @@
{
text: [
"◄"
],
textColor: [0xFFFF00],
}

6
views/res/scrollbar_btn_right.tim
View File

@ -1,6 +0,0 @@
{
text: [
"►"
],
textColor: [0xFFFF00],
}

6
views/res/scrollbar_btn_up.tim
View File

@ -1,6 +0,0 @@
{
text: [
"▲"
],
textColor: [0xFFFF00],
}

6
views/res/scrollbar_indicator_horizontal.tim
View File

@ -1,6 +0,0 @@
{
text: [
" "
],
textColor: [0xFFFF00],
}

7
views/res/scrollbar_indicator_vertical.tim
View File

@ -1,7 +0,0 @@
{
text: [
" "
],
textColor: [0xFFFF00],
ninePatch: [0]
}