github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: Fixed issue with LabelBox focus, Ch improvements

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@13989 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-02-11 11:03:18 +00:00
parent 4129525b5b
commit ac8520633f
5 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/CtrlCore/Ctrl.cpp
View file

@ -984,21 +984,15 @@ void Ctrl::ReSkin()
if(lock)
return;
lock++;
DLOG("============== Reskin");
DDUMP(SColorPaper());
ChReset();
DDUMP(SColorPaper());
Csize.cx = Dsize.cx = IsNoLayoutZoom;
if(s_chdefault)
(*s_chdefault)();
DDUMP(SColorPaper());
if(skin)
(*skin)();
DDUMP(SColorPaper());
Csize.cx = Dsize.cx = IsNoLayoutZoom;
Csizeinit();
ChFinish();
DDUMP(SColorPaper());
Vector<Ctrl *> ctrl = GetTopCtrls();
for(int i = 0; i < ctrl.GetCount(); i++) {
ctrl[i]->RefreshLayoutDeep();

5
uppsrc/CtrlCore/ToDo.txt
View file

@ -2,8 +2,7 @@
- U++ menu has some issues
- Vertical centering of DropList text is a bit off
- Classic is broken
- Standard visual glitches in dark theme
- Option box focus issue
- Inactive doc icon is not updated - [B] does not blink anymore
NTH:
@ -13,3 +12,5 @@ DONE:
- Slider in dark mode is transparent
- spin buttons slight visual problem in dark mode
- <-|-> cursor looks bad in dark mode
- Standard visual glitches in dark theme
- Option box focus issue

6
uppsrc/CtrlLib/Button.cpp
View file

@ -641,7 +641,7 @@ void Option::Paint(Draw& w) {
ds || IsReadOnly() ? SColorDisabled : Nvl(color, GetLabelTextColor(this)),
VisibleAccessKeys() ? accesskey : 0);
if(HasFocus())
DrawFocus(w, RectC(isz.cx + DPI(2), ty - DPI(1), tsz.cx + DPI(3), tsz.cy + DPI(2)) & sz);
DrawFocus(w, RectC(ix + isz.cx + DPI(2), ty - DPI(1), tsz.cx + DPI(3), tsz.cy + DPI(2)) & sz);
}
if(box) {
@ -746,7 +746,7 @@ void ButtonOption::Paint(Draw& w) {
CH_STYLE(ButtonOption, Style, StyleDefault)
{
const Button::Style& bs = Button::StyleNormal();
const Button::Style& bs = Button::StyleNormal();
for (int i = 0; i < 4; i++)
{
look[i] = bs.look[i];
@ -757,7 +757,7 @@ CH_STYLE(ButtonOption, Style, StyleDefault)
CH_STYLE(ButtonOption, Style, StyleFlat)
{
const ToolButton::Style& tbs = ToolButton::StyleDefault();
const ToolButton::Style& tbs = ToolButton::StyleDefault();
for (int i = 0; i < 4; i++)
{
look[i] = tbs.look[i];

4
uppsrc/CtrlLib/Ch.cpp
View file

@ -9,8 +9,8 @@ namespace Upp {
#define IMAGEFILE <CtrlLib/Ctrls.iml>
#include <Draw/iml_source.h>
#define FIXED_COLORS
#define FIXED_SIZE
// #define FIXED_COLORS
// #define FIXED_SIZE
#define IMAGECLASS ClassicCtrlsImg
#define IMAGEFILE <CtrlLib/ClassicCtrls.iml>
#include <Draw/iml_source.h>

14
uppsrc/ide/ide.lay
View file

@ -523,13 +523,13 @@ END_LAYOUT
LAYOUT(SetupHlLayout, 544, 300)
ITEM(ArrayCtrl, hlstyle, LeftPosZ(4, 368).TopPosZ(4, 292))
ITEM(Label, dv___1, SetLabel(t_("Scope highlighting")).LeftPosZ(380, 160).TopPosZ(4, 16))
ITEM(Switch, hilite_scope, SetLabel(t_("None\n2 colors\n5 colors")).LeftPosZ(380, 160).TopPosZ(20, 52))
ITEM(Label, dv___3, SetLabel(t_("Matching bracket highlighting")).LeftPosZ(380, 160).TopPosZ(68, 16))
ITEM(Switch, hilite_bracket, SetLabel(t_("None\nNormal\nFlashing")).LeftPosZ(380, 160).TopPosZ(84, 52))
ITEM(Label, dv___5, SetLabel(t_("#else/#elif/#endif info")).LeftPosZ(380, 160).TopPosZ(132, 16))
ITEM(Switch, hilite_ifdef, SetLabel(t_("None\nNormal\nWith line number")).LeftPosZ(380, 160).TopPosZ(148, 52))
ITEM(Option, hilite_if_endif, SetLabel(t_("#if/#endif tracing")).LeftPosZ(380, 160).TopPosZ(196, 18))
ITEM(Option, thousands_separator, SetLabel(t_("Thousands separator")).LeftPosZ(380, 160).TopPosZ(212, 18))
ITEM(Switch, hilite_scope, SetLabel(t_("None\n2 colors\n5 colors")).LeftPosZ(380, 160).TopPosZ(20, 20))
ITEM(Label, dv___3, SetLabel(t_("Matching bracket highlighting")).LeftPosZ(380, 160).TopPosZ(52, 16))
ITEM(Switch, hilite_bracket, SetLabel(t_("None\nNormal\nFlashing")).LeftPosZ(380, 160).TopPosZ(68, 20))
ITEM(Label, dv___5, SetLabel(t_("#else/#elif/#endif info")).LeftPosZ(380, 160).TopPosZ(100, 16))
ITEM(Switch, hilite_ifdef, SetLabel(t_("None\nNormal\nWith line number")).LeftPosZ(380, 160).TopPosZ(120, 48))
ITEM(Option, hilite_if_endif, SetLabel(t_("#if/#endif tracing")).LeftPosZ(380, 160).TopPosZ(180, 18))
ITEM(Option, thousands_separator, SetLabel(t_("Thousands separator")).LeftPosZ(380, 160).TopPosZ(200, 18))
ITEM(Option, hline, SetLabel(t_("Line")).LeftPosZ(432, 160).TopPosZ(228, 18))
ITEM(Option, vline, SetLabel(t_("Column")).LeftPosZ(480, 84).TopPosZ(228, 18))
ITEM(Button, hl_restore, SetLabel(t_("Restore default colors")).LeftPosZ(380, 160).TopPosZ(252, 20))