diff --git a/src/dlangui/widgets/controls.d b/src/dlangui/widgets/controls.d
index 266869a3..0e8973a4 100644
--- a/src/dlangui/widgets/controls.d
+++ b/src/dlangui/widgets/controls.d
@@ -305,8 +305,7 @@ class UrlImageTextButton : ImageTextButton {
//_icon.styleId = STYLE_BUTTON_IMAGE;
//_label.styleId = STYLE_BUTTON_LABEL;
//_label.textFlags(TextFlag.Underline);
- _label.ownStyle.getOrCreateState(State.Hovered, State.Hovered).textFlags(TextFlag.Underline);
- _label.textColor(0x000080);
+ _label.styleId = "BUTTON_LABEL_LINK";
padding(Rect(3,3,3,3));
}
}
diff --git a/src/dlangui/widgets/grid.d b/src/dlangui/widgets/grid.d
index d4c3cf33..f46ece19 100644
--- a/src/dlangui/widgets/grid.d
+++ b/src/dlangui/widgets/grid.d
@@ -1251,7 +1251,7 @@ class StringGridWidget : StringGridWidgetBase {
Point sz = fnt.textSize(txt);
Align ha = Align.Left;
applyAlign(rc, sz, ha, Align.VCenter);
- fnt.drawText(buf, rc.left + 1, rc.top + 1, txt, 0x000000);
+ fnt.drawText(buf, rc.left + 1, rc.top + 1, txt, textColor);
}
/// draw cell content
@@ -1272,7 +1272,7 @@ class StringGridWidget : StringGridWidgetBase {
if (row < 0)
ha = Align.HCenter;
applyAlign(rc, sz, ha, Align.VCenter);
- fnt.drawText(buf, rc.left + 1, rc.top + 1, txt, 0x000000);
+ fnt.drawText(buf, rc.left + 1, rc.top + 1, txt, textColor);
}
/// draw cell background
@@ -1288,7 +1288,7 @@ class StringGridWidget : StringGridWidgetBase {
if (_rowSelect && selectedRow)
selectedCell = true;
// draw header cell background
- uint cl = 0x80909090;
+ uint cl = 0xC0909090;
if (c >= _headerCols || r >= _headerRows) {
if (c < _headerCols && selectedRow)
cl = 0x80FFC040;
@@ -1296,8 +1296,8 @@ class StringGridWidget : StringGridWidgetBase {
cl = 0x80FFC040;
}
buf.fillRect(rc, cl);
- buf.fillRect(vborder, 0x80202020);
- buf.fillRect(hborder, 0x80202020);
+ buf.fillRect(vborder, 0xC0202020);
+ buf.fillRect(hborder, 0xC0202020);
}
/// draw cell background
@@ -1315,15 +1315,15 @@ class StringGridWidget : StringGridWidgetBase {
// normal cell background
if (c < _fixedCols || r < _fixedRows) {
// fixed cell background
- buf.fillRect(rc, 0x80E0E0E0);
+ buf.fillRect(rc, 0xC0E0E0E0);
}
- buf.fillRect(vborder, 0x80C0C0C0);
- buf.fillRect(hborder, 0x80C0C0C0);
+ buf.fillRect(vborder, 0xC0C0C0C0);
+ buf.fillRect(hborder, 0xC0C0C0C0);
if (selectedCell) {
if (_rowSelect)
- buf.drawFrame(rc, 0x80A0B0FF, Rect(0,1,0,1), 0xC0FFFF00);
+ buf.drawFrame(rc, 0xC0A0B0FF, Rect(0,1,0,1), 0xE0FFFF40);
else
- buf.drawFrame(rc, 0x404040FF, Rect(1,1,1,1), 0xC0FFFF00);
+ buf.drawFrame(rc, 0x804040FF, Rect(1,1,1,1), 0xE0FFFF40);
}
}
diff --git a/src/dlangui/widgets/styles.d b/src/dlangui/widgets/styles.d
index ed2162f6..edf6d2c9 100644
--- a/src/dlangui/widgets/styles.d
+++ b/src/dlangui/widgets/styles.d
@@ -377,10 +377,10 @@ class Style {
}
/// get custom color attribute
- uint customColor(string id) {
+ uint customColor(string id, uint defColor = COLOR_TRANSPARENT) const {
if (id in _customColors)
return _customColors[id];
- return parentStyle.customColor(id);
+ return parentStyle.customColor(id, defColor);
}
/// sets custom color attribute for style
@@ -883,10 +883,10 @@ class Theme : Style {
}
/// get custom color attribute - transparent by default
- override uint customColor(string id) {
+ override uint customColor(string id, uint defColor = COLOR_TRANSPARENT) const {
if (id in _customColors)
return _customColors[id];
- return COLOR_TRANSPARENT;
+ return defColor;
}
/// returns colors to draw focus rectangle or null if no focus rect should be drawn for style
diff --git a/views/res/combobox_background_dark.xml b/views/res/combobox_background_dark.xml
index f9bedd80..e6eba40d 100644
--- a/views/res/combobox_background_dark.xml
+++ b/views/res/combobox_background_dark.xml
@@ -1,18 +1,18 @@