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

TextDiffCtrl fix

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1002 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-03-23 08:36:27 +00:00
parent 84036412ee
commit 0affcd354a
3 changed files with 7 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

26
uppsrc/TextDiffCtrl/TextCtrl.cpp
View file

@ -4,28 +4,7 @@ namespace Upp {
inline Color HistoryBg() { return Color(255, 255, 0); }
/*
struct GapDisplay : public Display {
virtual void Paint(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const
{
draw.DrawRect(rc, paper);
Rect clip = rc.Deflated(3, 0);
draw.Clip(clip);
WString txt = IsString(v) ? v : StdConvert().Format(v);
Font fnt = StdFont();
int tcy = GetTLTextHeight(txt, fnt);
DrawTLText(draw, rc.left + 5, rc.top + max((rc.Height() - tcy) / 2, 0), rc.Width(), txt, fnt, ink);
draw.End();
}
};
struct HistoryRowDisplay : public GapDisplay {
virtual void Paint(Draw& draw, const Rect& rc, const Value& v, Color ink, Color paper, dword style) const
{
GapDisplay::Paint(draw, rc, v, ink, style & CURSOR ? paper : HistoryBg(), style);
}
};
*/
TextCompareCtrl::TextCompareCtrl()
{
letter = Size(1, 1);
@ -46,11 +25,10 @@ TextCompareCtrl::TextCompareCtrl()
void TextCompareCtrl::LeftDown(Point pt, dword keyflags)
{
if(pt.x < gutter_width || HasCapture())
{
Size sz = GetSize();
if(pt.x > sz.cx - gutter_width || HasCapture()) {
if(!HasCapture())
SetCapture();
Size sz = GetSize();
int line = (pt.y * lines.GetCount()) / sz.cy;
int page_lines = sz.cy / letter.cy;
scroll.SetY(line - page_lines / 2);