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

CtrlCore: Fixed workares issue in X11/GTK, various cosmetics

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7336 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-04-28 16:55:48 +00:00
parent f59fe47620
commit e2b5d44cc8
32 changed files with 87 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/CodeEditor/CodeEditor.cpp
View file

@ -323,11 +323,12 @@ void CodeEditor::IndentEnter(int count) {
const wchar *s = pl;
while(*s == '\t' || *s == ' ')
InsertChar(*s++, 1);
if(st.stmtline == cl || st.blk.GetCount() && st.blk.Top() == cl)
if(st.stmtline == cl || st.blk.GetCount() && st.blk.Top() == cl) {
if(indent_spaces || (s > pl && s[-1] == ' '))
InsertChar(' ', indent_amount);
else
InsertChar('\t', 1);
}
}
}
@ -512,7 +513,7 @@ void CodeEditor::MoveNextBrk(bool sel) {
void CodeEditor::MovePrevBrk(bool sel) {
int p = GetCursor();
if(p < 2) return;
if(!isrbrkt(GetChar(p - 1)))
if(!isrbrkt(GetChar(p - 1))) {
if(p < GetLength() - 1 && isrbrkt(GetChar(p)))
p++;
else {
@ -520,6 +521,7 @@ void CodeEditor::MovePrevBrk(bool sel) {
PlaceCaret(p, sel);
return;
}
}
int lvl = 1;
p -= 2;
for(;;) {