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

ide: Fixed issue with font change and line numbers #929

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7922 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-11-23 16:49:15 +00:00
parent 8a712075e8
commit 822f228350
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/CodeEditor/CodeEditor.cpp
View file

@ -53,6 +53,7 @@ void CodeEditor::Highlight(const String& h)
SetColor(LineEdit::PAPER_READONLY, hl_style[HighlightSetup::PAPER_READONLY].color);
SetColor(LineEdit::PAPER_SELECTED, hl_style[HighlightSetup::PAPER_SELECTED].color);
Refresh();
EditorBarLayout();
}
void CodeEditor::DirtyFrom(int line) {

12
uppsrc/CodeEditor/CodeEditor.h
View file

@ -85,7 +85,6 @@ private:
String& PointBreak(int& y);
void sPaintImage(Draw& w, int y, int fy, const Image& img);
void SyncWidth();
public:
Callback1<int> WhenBreakpoint;
@ -99,6 +98,8 @@ public:
void Scroll() { Refresh(); }
void SyncWidth();
void Renumber(int linecount);
void ClearBreakpoints();
void ValidateBreakpoints();
@ -188,9 +189,6 @@ public:
virtual void Serialize(Stream& s);
virtual void MouseLeave();
void CheckEdited(bool e = true) { check_edited = e; }
bool GetCheckEdited() { return check_edited; }
protected:
virtual void HighlightLine(int line, Vector<LineEdit::Highlight>& h, int pos);
virtual void PreInsert(int pos, const WString& s);
@ -412,6 +410,12 @@ public:
Callback1<int> WhenBreakpoint;
void CheckEdited(bool e = true) { check_edited = e; }
bool GetCheckEdited() { return check_edited; }
void EditorBarLayout() { bar.SyncWidth(); }
LineInfo GetLineInfo() const { return bar.GetLineInfo(); }
void SetLineInfo(const LineInfo& lf);
LineInfoRem GetLineInfoRem() { return LineInfoRem(bar.GetLineInfoRem(), 0); }

1
uppsrc/ide/Setup.cpp
View file

@ -173,6 +173,7 @@ void Ide::EditorFontScroll(int d)
while(editorfont.GetCy() == h && (d < 0 ? editorfont.GetCy() > 5 : editorfont.GetCy() < 40))
editorfont.Height(q += d);
editor.SetFont(editorfont);
editor.EditorBarLayout();
}
struct FormatDlg : TabDlg {