From 571ac7f00090b44675da1dc85a94da269bf367aa Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Sun, 22 Jan 2023 23:44:42 +0100 Subject: [PATCH] ide: Improved diff ctrl scrollbar look --- uppsrc/TextDiffCtrl/Diff.iml | 66 +++++++++++++++++--------------- uppsrc/TextDiffCtrl/TextCtrl.cpp | 14 ++++--- uppsrc/ide/ide.lay | 2 +- 3 files changed, 44 insertions(+), 38 deletions(-) diff --git a/uppsrc/TextDiffCtrl/Diff.iml b/uppsrc/TextDiffCtrl/Diff.iml index 1a9ecd7f1..d88066ed0 100644 --- a/uppsrc/TextDiffCtrl/Diff.iml +++ b/uppsrc/TextDiffCtrl/Diff.iml @@ -1,6 +1,8 @@ PREMULTIPLIED IMAGE_ID(dot__UHD) +IMAGE_ID(dot1__UHD) IMAGE_ID(dot) +IMAGE_ID(dot1) IMAGE_ID(Next) IMAGE_ID(Prev) IMAGE_ID(Patched) @@ -12,34 +14,36 @@ IMAGE_ID(CopyLeft) IMAGE_ID(CopyRight) IMAGE_BEGIN_DATA -IMAGE_DATA(120,156,237,153,191,107,219,64,20,199,21,99,27,235,72,77,150,82,40,46,134,110,246,150,161,224,41,54,133,210,226,93) -IMAGE_DATA(99,201,224,173,155,161,133,110,214,63,96,40,132,204,222,51,120,114,135,46,145,167,64,51,102,205,208,16,40,116,109,160) -IMAGE_DATA(243,85,95,73,103,159,78,247,67,210,57,212,80,189,240,176,124,239,125,222,123,119,247,116,72,206,59,226,16,71,34,195) -IMAGE_DATA(80,131,80,105,162,139,80,187,130,207,41,108,131,129,67,231,243,88,113,157,248,159,38,62,96,168,231,57,148,210,180,98) -IMAGE_DATA(44,241,69,174,133,204,71,240,141,234,65,30,149,31,108,172,230,156,126,65,142,188,139,164,70,211,60,186,5,214,133,73) -IMAGE_DATA(55,137,191,169,39,201,21,75,35,252,227,228,89,168,183,73,194,155,228,251,205,253,125,92,8,62,153,93,82,224,173,224) -IMAGE_DATA(183,225,153,29,223,215,71,206,145,172,27,42,41,47,158,179,221,221,60,234,73,99,116,66,27,54,78,246,135,241,142,146) -IMAGE_DATA(213,199,200,199,202,99,20,99,211,49,174,74,177,219,24,234,181,202,43,29,11,246,191,144,234,48,200,47,54,205,100,211) -IMAGE_DATA(204,54,55,147,205,205,108,115,152,216,28,102,187,56,76,43,41,33,251,115,24,180,45,110,182,126,212,124,131,210,236,91) -IMAGE_DATA(103,94,154,157,134,173,93,166,118,176,126,216,204,253,18,205,204,88,207,185,72,141,183,163,85,152,106,235,97,44,84,230) -IMAGE_DATA(199,236,178,53,225,89,228,81,9,88,248,96,109,152,31,207,78,194,163,205,36,96,153,63,127,237,71,7,137,121,175,225) -IMAGE_DATA(195,51,76,139,236,53,106,231,89,212,81,84,48,215,34,117,139,130,61,66,94,113,175,139,8,214,62,71,143,74,15,131) -IMAGE_DATA(35,66,126,29,30,30,210,60,10,95,145,111,181,90,23,239,91,173,240,21,197,209,42,124,224,43,242,141,70,99,138,216) -IMAGE_DATA(38,30,62,240,21,249,131,131,131,14,108,203,122,93,201,194,6,31,248,202,22,198,117,221,43,221,28,96,131,143,106,97) -IMAGE_DATA(155,205,230,252,5,33,127,84,60,108,240,81,241,181,90,109,128,250,190,215,106,25,22,99,176,193,71,197,67,158,16,242) -IMAGE_DATA(243,115,179,153,225,49,6,155,142,133,96,111,94,185,238,131,200,99,76,182,111,162,212,235,117,143,237,3,175,24,131,205) -IMAGE_DATA(196,179,57,136,61,151,167,246,93,9,250,227,165,235,254,96,185,113,173,234,25,153,60,39,228,225,181,235,110,230,142,107) -IMAGE_DATA(140,229,229,145,147,223,67,92,99,44,47,207,246,128,87,229,218,239,205,147,65,44,134,71,66,223,160,14,189,187,187,147) -IMAGE_DATA(42,227,231,95,2,169,62,6,207,127,231,121,92,155,120,89,44,62,191,24,131,231,205,235,184,213,199,200,191,139,249,103) -IMAGE_DATA(115,171,215,127,219,27,89,30,99,235,245,90,201,99,252,235,183,223,202,250,193,170,120,198,242,188,101,255,254,91,217,229) -IMAGE_DATA(97,208,239,247,189,213,106,69,131,32,160,103,103,103,247,132,144,167,69,248,225,112,56,11,130,25,189,188,188,140,98,48) -IMAGE_DATA(93,173,62,81,196,54,241,163,209,104,70,233,199,204,79,190,215,215,14,133,205,49,188,187,199,252,44,195,7,193,134,231) -IMAGE_DATA(55,55,19,35,230,63,232,120,62,127,38,6,230,184,88,140,169,239,143,82,58,155,189,145,205,127,23,63,170,177,24,162) -IMAGE_DATA(168,26,211,212,240,188,159,172,46,195,97,155,169,75,140,17,249,30,31,31,211,201,100,66,151,203,165,138,23,99,108,62) -IMAGE_DATA(225,59,30,143,233,249,249,121,164,26,158,143,177,81,150,159,103,125,223,87,241,153,58,88,126,158,213,228,215,174,31,99) -IMAGE_DATA(139,240,90,173,14,3,145,175,14,3,197,152,74,84,124,166,174,94,175,151,234,143,240,53,75,213,31,210,185,157,156,156) -IMAGE_DATA(40,251,3,177,53,49,162,79,244,151,170,63,96,211,212,17,105,204,203,251,67,193,167,234,136,121,121,127,104,248,212,250) -IMAGE_DATA(169,250,67,50,255,226,178,103,175,9,123,36,237,240,189,112,90,252,7,163,20,91,230,209,143,103,203,240,147,43,243,227) -IMAGE_DATA(168,238,241,212,54,191,24,163,172,216,172,127,37,165,164,58,12,202,10,26,181,109,241,239,70,220,40,54,49,216,205,42) -IMAGE_DATA(139,81,244,48,152,152,127,221,47,148,63,47,111,51,127,219,245,175,68,148,191,193,149,37,168,0,0,0,0,0,0,0) -IMAGE_END_DATA(960, 11) +IMAGE_DATA(120,156,237,89,191,107,219,64,20,86,140,109,44,145,154,44,165,80,92,2,221,226,45,67,193,83,108,10,165,193,187,198) +IMAGE_DATA(146,193,91,55,67,11,221,172,127,192,80,8,153,189,123,240,228,14,93,34,79,129,102,204,218,161,193,80,232,218,64,231) +IMAGE_DATA(171,62,89,103,159,79,247,83,231,80,67,245,133,135,229,187,239,123,239,221,187,167,67,114,206,3,47,240,4,232,38,22) +IMAGE_DATA(39,70,50,155,36,118,204,113,46,48,215,233,120,100,60,94,25,174,51,254,69,198,129,134,132,161,71,8,217,54,140,101) +IMAGE_DATA(92,196,154,136,56,28,55,205,7,113,100,60,204,209,156,13,121,177,65,220,73,150,163,110,29,199,22,117,161,56,206,252) +IMAGE_DATA(175,243,201,98,165,56,151,108,142,17,90,45,175,149,4,31,35,201,229,210,91,226,26,99,60,7,115,252,162,48,198,114) +IMAGE_DATA(169,31,73,49,199,148,39,242,197,26,229,169,56,240,97,27,215,116,29,108,93,40,95,84,23,35,212,146,63,6,207,18) +IMAGE_DATA(251,158,117,195,93,246,253,46,9,66,19,33,116,94,208,61,223,57,222,90,79,231,211,239,92,64,33,166,83,111,10,71) +IMAGE_DATA(248,20,85,91,197,227,177,56,242,142,108,10,82,66,143,208,219,220,235,38,22,10,125,180,146,57,116,138,232,15,227,45) +IMAGE_DATA(169,86,237,195,76,43,246,97,167,221,246,113,83,72,187,241,33,175,149,41,236,111,255,255,12,229,97,96,14,151,102,114) +IMAGE_DATA(105,102,151,155,201,229,102,118,57,76,92,14,179,93,28,166,37,10,96,127,14,131,166,195,205,214,78,155,175,83,88,251) +IMAGE_DATA(118,243,0,106,173,29,38,173,93,36,119,104,163,164,153,219,5,154,153,106,67,238,145,175,153,86,97,168,204,135,106,97) +IMAGE_DATA(34,30,157,23,213,132,213,34,142,12,208,130,131,218,80,30,171,29,36,71,155,14,208,82,62,123,29,165,7,137,126,175) +IMAGE_DATA(193,97,53,212,108,246,26,185,179,218,225,230,133,198,24,88,171,77,222,60,176,71,136,203,239,181,13,80,123,131,30,21) +IMAGE_DATA(30,6,71,65,240,235,240,240,144,152,24,184,188,190,209,104,76,223,53,26,201,43,138,167,52,112,192,229,245,181,90,109) +IMAGE_DATA(8,223,58,61,56,224,242,250,131,131,131,22,230,102,213,170,84,139,57,112,192,21,21,198,247,253,27,213,26,48,7,142) +IMAGE_DATA(172,176,245,122,125,252,34,8,254,200,244,152,3,71,166,175,84,42,29,228,247,173,82,201,105,49,134,57,112,100,122,224) +IMAGE_DATA(73,16,252,252,84,175,231,244,24,195,156,74,11,96,111,94,249,254,3,175,199,152,104,223,120,84,171,213,144,238,3,107) +IMAGE_DATA(24,195,156,78,79,215,192,247,156,73,238,187,2,250,227,165,239,255,160,177,113,45,235,25,17,158,7,193,195,107,223,95) +IMAGE_DATA(175,29,215,24,51,213,35,38,187,135,184,198,152,169,158,238,1,107,210,218,239,205,147,193,10,154,71,194,72,99,30,185) +IMAGE_DATA(191,191,23,26,213,143,63,199,66,123,12,61,251,157,213,227,90,167,23,249,98,227,243,62,88,189,190,142,27,123,140,248) +IMAGE_DATA(187,88,127,62,182,188,254,155,222,200,235,49,182,88,44,164,122,140,127,249,250,91,154,63,180,50,61,213,178,122,199,254) +IMAGE_DATA(253,183,216,229,97,208,110,183,195,249,124,78,226,56,38,151,151,151,203,32,8,158,218,232,187,221,238,40,142,71,228,250) +IMAGE_DATA(250,58,245,65,109,62,255,72,224,91,167,239,245,122,35,66,62,228,126,135,190,189,245,8,230,60,205,187,251,74,63,202) +IMAGE_DATA(233,227,120,173,103,55,55,231,99,165,127,175,210,179,241,115,62,176,198,201,164,79,162,168,183,101,163,209,27,209,250,119) +IMAGE_DATA(241,163,26,245,193,67,214,152,186,134,103,121,162,188,52,135,109,46,47,222,71,202,61,61,61,37,131,193,128,204,102,51) +IMAGE_DATA(153,158,247,177,254,4,183,223,239,147,171,171,171,212,20,122,214,199,218,104,124,86,27,69,145,76,159,203,131,198,103,181) +IMAGE_DATA(138,248,202,250,81,173,141,94,105,229,97,192,235,203,195,64,50,38,131,76,159,203,235,228,228,100,171,63,146,215,44,89) +IMAGE_DATA(127,8,215,118,118,118,38,237,15,248,86,248,72,63,209,95,178,254,192,156,34,143,212,86,122,113,127,72,244,91,121,172) +IMAGE_DATA(244,226,254,80,232,183,234,39,235,15,193,250,237,177,103,175,9,123,132,102,242,94,56,180,255,193,104,75,91,228,209,143) +IMAGE_DATA(213,22,209,15,110,244,143,163,170,199,83,215,248,188,143,162,112,169,127,137,66,40,15,131,162,64,163,54,29,254,221,136) +IMAGE_DATA(27,197,197,7,189,89,69,62,108,15,131,129,254,215,125,171,248,166,122,151,245,187,214,191,4,143,191,233,51,205,147,0) +IMAGE_END_DATA(1024, 13) diff --git a/uppsrc/TextDiffCtrl/TextCtrl.cpp b/uppsrc/TextDiffCtrl/TextCtrl.cpp index 61dd6bc3b..c4fa7af47 100644 --- a/uppsrc/TextDiffCtrl/TextCtrl.cpp +++ b/uppsrc/TextDiffCtrl/TextCtrl.cpp @@ -239,13 +239,15 @@ void TextCompareCtrl::ScrollBarItems::Paint(Draw& w) void TextCompareCtrl::PaintScrollBarItems(Draw& w) { - Size isz = DiffImg::dot().GetSize(); Rect sr = scroll.y.GetSliderRect(); - for(int i = 0; i < lines.GetCount(); i++) - if(lines[i].level > 1) - w.DrawImage(sr.CenterPoint().x - isz.cx / 2, - sr.top + scroll.y.GetSliderPos(i) - isz.cy / 2, - DiffImg::dot()); + for(int pass = 0; pass < 2; pass++) { + Size isz = pass ? DiffImg::dot1().GetSize() : DiffImg::dot().GetSize(); + for(int i = 0; i < lines.GetCount(); i++) + if(lines[i].level > 1) + w.DrawImage(sr.CenterPoint().x - isz.cx / 2, + sr.top + scroll.y.GetSliderPos(i) - isz.cy / 2, + pass ? DiffImg::dot1() : DiffImg::dot()); + } } void TextCompareCtrl::Paint(Draw& draw) diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay index 6dceeb69d..7020c1e63 100644 --- a/uppsrc/ide/ide.lay +++ b/uppsrc/ide/ide.lay @@ -809,7 +809,7 @@ LAYOUT(RenamePackage2Layout, 228, 100) ITEM(Upp::Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24)) END_LAYOUT -LAYOUT(NewPackageFileLayout, 260, 88) +LAYOUT(NewPackageFileLayout, 280, 88) ITEM(Upp::EditString, name, HSizePosZ(48, 8).TopPosZ(28, 19)) ITEM(Upp::Label, dv___1, SetLabel(t_("Name ")).LeftPosZ(4, 40).TopPosZ(28, 19)) ITEM(Upp::DropList, type, HSizePosZ(4, 8).TopPosZ(4, 19))