github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/ultimatepp/ultimatepp

Browse source
This commit is contained in:
Mirek Fidler 2022-09-15 20:16:09 +02:00
commit b1617ed3d3
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/CtrlLib/CtrlLib.usc
View file

@ -1380,7 +1380,7 @@ ctrl DropDate {
n = r.bottom - r.top;
DrawDropButton(w, RectC(r.right - n, r.top, n, n));
w.DrawText(3, (GetSize().cy - GetTextSize("", Arial(10)).cy) / 2,
(.SetEditable ? "" : "R/O ") + (.NotNull ? "!" : "") + "01/05/2007", Arial(10), :SMagenta);
(.SetEditable ? "" : "R/O ") + (.NotNull ? "!" : "") + "25/07/2022", Arial(10), :SMagenta);
}
}
@ -1408,7 +1408,7 @@ ctrl DropTime {
n = r.bottom - r.top;
DrawDropButton(w, RectC(r.right - n, r.top, n, n));
w.DrawText(3, (GetSize().cy - GetTextSize("", Arial(10)).cy) / 2,
(.SetEditable ? "" : "R/O ") + (.NotNull ? "!" : "") + "01/05/2007 10:34:58", Arial(10), :SMagenta);
(.SetEditable ? "" : "R/O ") + (.NotNull ? "!" : "") + "25/07/2022 10:34:58", Arial(10), :SMagenta);
}
}
@ -1588,7 +1588,7 @@ ctrl Calendar {
}
}
today = "Today: 01/19/2007";
today = "Today: 25/07/2022";
ts = GetTextSize(today, StdFont().Bold());
w.DrawText((r.right - ts.cx) / 2, r.bottom - 3 - ts.cy, today, f.Bold(), :SBlue);
@ -1602,7 +1602,7 @@ ctrl Calendar {
right = r.right;
r.left -= 15 + 40;
r.right -= 15 + 40;
PaintCenterText(w, (r.left + right) / 2, (r.top + r.bottom) / 2, "2007", f.Bold(), :SWhite);
PaintCenterText(w, (r.left + right) / 2, (r.top + r.bottom) / 2, "2022", f.Bold(), :SWhite);
DrawCtrlFrame(w, ro, .SetFrame);
}

4
uppsrc/CtrlLib/DateTimeCtrl.cpp
View file

@ -83,7 +83,7 @@ void Calendar::Reset()
Calendar& Calendar::SetStyle(const Style& s)
{
style = &s;
nbg = CtrlImg::Bg();
nbg = Colorize(IsDarkTheme() ? DarkTheme(CtrlImg::Bg()) : CtrlImg::Bg(), s.header);
Refresh();
return *this;
}
@ -800,7 +800,7 @@ LineCtrl::LineCtrl()
Clock& Clock::SetStyle(const Style& s)
{
style = &s;
nbg = CtrlImg::Bg();
nbg = Colorize(IsDarkTheme() ? DarkTheme(CtrlImg::Bg()) : CtrlImg::Bg(), s.header);
Refresh();
return *this;
}