Skip to content

Commit

Permalink
Add option "Backspace key smart delete spaces." on Tab Settings dialo…
Browse files Browse the repository at this point in the history 
…g, issue #660.
  • Loading branch information
@zufuliu
zufuliu committed May 18, 2023
1 parent f049415 commit 5f0c078
Show file tree
Hide file tree
Showing 16 changed files with 61 additions and 45 deletions.
9 changes: 5 additions & 4 deletions locale/de/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP3,7,217,10,10
END

IDD_TABSETTINGS DIALOGEX 0, 0, 232, 197
IDD_TABSETTINGS DIALOGEX 0, 0, 232, 209
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Tab Settings"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
Expand All @@ -1352,9 +1352,10 @@ BEGIN
AUTOCHECKBOX "Use sche&me settings.",IDC_FILE_USE_SCHEME_TAB,118,114,101,10,WS_TABSTOP
AUTOCHECKBOX "Tab &key reformats indentation.",IDC_TAB_INDENT,7,135,160,10,WS_TABSTOP
AUTOCHECKBOX "&Backspace key reformats indentation.",IDC_BACKSPACE_UNINDENT,7,147,160,10,WS_TABSTOP
AUTOCHECKBOX "Auto dete&ct Tab and indentation settings.",IDC_DETECT_INDENTATION,7,159,160,10,WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,119,176,50,14
PUSHBUTTON "Cancel",IDCANCEL,175,176,50,14
AUTOCHECKBOX "Backspace key sma&rt delete spaces.",IDC_BACKSPACE_SMARTDEL,7,159,160,10,WS_TABSTOP
AUTOCHECKBOX "Auto dete&ct Tab and indentation settings.",IDC_DETECT_INDENTATION,7,171,160,10,WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,119,188,50,14
PUSHBUTTON "Cancel",IDCANCEL,175,188,50,14
END

IDD_LONGLINES DIALOGEX 0, 0, 184, 55
Expand Down
9 changes: 5 additions & 4 deletions locale/fr-FR/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1324,7 +1324,7 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP3,7,217,10,10
END

IDD_TABSETTINGS DIALOGEX 0, 0, 232, 197
IDD_TABSETTINGS DIALOGEX 0, 0, 232, 209
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Réglage de tabulation"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
Expand All @@ -1351,9 +1351,10 @@ BEGIN
AUTOCHECKBOX "Utiliser les réglages du thème.",IDC_FILE_USE_SCHEME_TAB,118,114,101,10,WS_TABSTOP
AUTOCHECKBOX "La touche tabulation permet de reformater les indentations.",IDC_TAB_INDENT,7,135,160,10,WS_TABSTOP
AUTOCHECKBOX "La touche retour arrière permet de reformater les indentations.",IDC_BACKSPACE_UNINDENT,7,147,160,10,WS_TABSTOP
AUTOCHECKBOX "Détecter automatiquement les réglages de tabulation et d'indentation.",IDC_DETECT_INDENTATION,7,159,160,10,WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,119,176,50,14
PUSHBUTTON "Annuler",IDCANCEL,175,176,50,14
AUTOCHECKBOX "Backspace key sma&rt delete spaces.",IDC_BACKSPACE_SMARTDEL,7,159,160,10,WS_TABSTOP
AUTOCHECKBOX "Détecter automatiquement les réglages de tabulation et d'indentation.",IDC_DETECT_INDENTATION,7,171,160,10,WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,119,188,50,14
PUSHBUTTON "Annuler",IDCANCEL,175,188,50,14
END

IDD_LONGLINES DIALOGEX 0, 0, 184, 55
Expand Down
9 changes: 5 additions & 4 deletions locale/it/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP3,7,217,10,10
END

IDD_TABSETTINGS DIALOGEX 0, 0, 232, 197
IDD_TABSETTINGS DIALOGEX 0, 0, 232, 209
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Impostazioni Tab"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
Expand All @@ -1352,9 +1352,10 @@ BEGIN
AUTOCHECKBOX "Usa impostazioni sche&ma.",IDC_FILE_USE_SCHEME_TAB,133,114,90,10,WS_TABSTOP
AUTOCHECKBOX "Tasto Tab riformatta indenta&zione.",IDC_TAB_INDENT,7,135,160,10,WS_TABSTOP
AUTOCHECKBOX "Tasto &Backspace riformatta indentazione.",IDC_BACKSPACE_UNINDENT,7,147,160,10,WS_TABSTOP
AUTOCHECKBOX "Rileva automati&camente impostazioni Tab e indentazione.",IDC_DETECT_INDENTATION,7,159,218,10,WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,119,176,50,14
PUSHBUTTON "Annulla",IDCANCEL,175,176,50,14
AUTOCHECKBOX "Backspace key sma&rt delete spaces.",IDC_BACKSPACE_SMARTDEL,7,159,160,10,WS_TABSTOP
AUTOCHECKBOX "Rileva automati&camente impostazioni Tab e indentazione.",IDC_DETECT_INDENTATION,7,171,160,10,WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,119,188,50,14
PUSHBUTTON "Annulla",IDCANCEL,175,188,50,14
END

IDD_LONGLINES DIALOGEX 0, 0, 184, 55
Expand Down
9 changes: 5 additions & 4 deletions locale/ja/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP3,7,217,10,10
END

IDD_TABSETTINGS DIALOGEX 0, 0, 232, 197
IDD_TABSETTINGS DIALOGEX 0, 0, 232, 209
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "タブキーの設定"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
Expand All @@ -1352,9 +1352,10 @@ BEGIN
AUTOCHECKBOX "文書の種類の設定を使用(&M)",IDC_FILE_USE_SCHEME_TAB,118,114,101,10,WS_TABSTOP
AUTOCHECKBOX "タブキーで追加しインデント全体を再変換(&K)",IDC_TAB_INDENT,7,135,160,10,WS_TABSTOP
AUTOCHECKBOX "バックスペースで削除し、同様に再変換(&B)",IDC_BACKSPACE_UNINDENT,7,147,160,10,WS_TABSTOP
AUTOCHECKBOX "タブとインデントの設定を自動検出(&C)",IDC_DETECT_INDENTATION,7,159,160,10,WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,119,176,50,14
PUSHBUTTON "キャンセル",IDCANCEL,175,176,50,14
AUTOCHECKBOX "Backspace key sma&rt delete spaces.",IDC_BACKSPACE_SMARTDEL,7,159,160,10,WS_TABSTOP
AUTOCHECKBOX "タブとインデントの設定を自動検出(&C)",IDC_DETECT_INDENTATION,7,171,160,10,WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,119,188,50,14
PUSHBUTTON "キャンセル",IDCANCEL,175,188,50,14
END

IDD_LONGLINES DIALOGEX 0, 0, 184, 55
Expand Down
9 changes: 5 additions & 4 deletions locale/ko/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP3,7,217,10,10
END

IDD_TABSETTINGS DIALOGEX 0, 0, 232, 197
IDD_TABSETTINGS DIALOGEX 0, 0, 232, 209
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "탭 설정"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
Expand All @@ -1352,9 +1352,10 @@ BEGIN
AUTOCHECKBOX "구성표 설정 사용(&M).",IDC_FILE_USE_SCHEME_TAB,118,114,101,10,WS_TABSTOP
AUTOCHECKBOX "탭 키 들여쓰기 재구성(&K)",IDC_TAB_INDENT,7,135,160,10,WS_TABSTOP
AUTOCHECKBOX "백스페이스 키 들여쓰기 재구성(&B)",IDC_BACKSPACE_UNINDENT,7,147,160,10,WS_TABSTOP
AUTOCHECKBOX "탭 및 들여쓰기 설정 자동 감지(&C)",IDC_DETECT_INDENTATION,7,159,160,10,WS_TABSTOP
DEFPUSHBUTTON "확인",IDOK,119,176,50,14
PUSHBUTTON "취소",IDCANCEL,175,176,50,14
AUTOCHECKBOX "Backspace key sma&rt delete spaces.",IDC_BACKSPACE_SMARTDEL,7,159,160,10,WS_TABSTOP
AUTOCHECKBOX "탭 및 들여쓰기 설정 자동 감지(&C)",IDC_DETECT_INDENTATION,7,171,160,10,WS_TABSTOP
DEFPUSHBUTTON "확인",IDOK,119,188,50,14
PUSHBUTTON "취소",IDCANCEL,175,188,50,14
END

IDD_LONGLINES DIALOGEX 0, 0, 184, 55
Expand Down
9 changes: 5 additions & 4 deletions locale/pt-BR/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP3,7,217,10,10
END

IDD_TABSETTINGS DIALOGEX 0, 0, 232, 197
IDD_TABSETTINGS DIALOGEX 0, 0, 232, 209
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Tab Settings"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
Expand All @@ -1352,9 +1352,10 @@ BEGIN
AUTOCHECKBOX "Use sche&me settings.",IDC_FILE_USE_SCHEME_TAB,118,114,101,10,WS_TABSTOP
AUTOCHECKBOX "Tab &key reformats indentation.",IDC_TAB_INDENT,7,135,160,10,WS_TABSTOP
AUTOCHECKBOX "&Backspace key reformats indentation.",IDC_BACKSPACE_UNINDENT,7,147,160,10,WS_TABSTOP
AUTOCHECKBOX "Auto dete&ct Tab and indentation settings.",IDC_DETECT_INDENTATION,7,159,160,10,WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,119,176,50,14
PUSHBUTTON "Cancel",IDCANCEL,175,176,50,14
AUTOCHECKBOX "Backspace key sma&rt delete spaces.",IDC_BACKSPACE_SMARTDEL,7,159,160,10,WS_TABSTOP
AUTOCHECKBOX "Auto dete&ct Tab and indentation settings.",IDC_DETECT_INDENTATION,7,171,160,10,WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,119,188,50,14
PUSHBUTTON "Cancel",IDCANCEL,175,188,50,14
END

IDD_LONGLINES DIALOGEX 0, 0, 184, 55
Expand Down
9 changes: 5 additions & 4 deletions locale/zh-Hans/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP3,7,217,10,10
END

IDD_TABSETTINGS DIALOGEX 0, 0, 232, 197
IDD_TABSETTINGS DIALOGEX 0, 0, 232, 209
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "制表符设置"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
Expand All @@ -1352,9 +1352,10 @@ BEGIN
AUTOCHECKBOX "使用文件类型设置(&M)",IDC_FILE_USE_SCHEME_TAB,118,114,101,10,WS_TABSTOP
AUTOCHECKBOX "制表键重新格式化缩进(&K)",IDC_TAB_INDENT,7,135,160,10,WS_TABSTOP
AUTOCHECKBOX "退格键重新格式化缩进(&B)",IDC_BACKSPACE_UNINDENT,7,147,160,10,WS_TABSTOP
AUTOCHECKBOX "自动检查制表符和缩进设置(&C)",IDC_DETECT_INDENTATION,7,159,160,10,WS_TABSTOP
DEFPUSHBUTTON "确定",IDOK,119,176,50,14
PUSHBUTTON "取消",IDCANCEL,175,176,50,14
AUTOCHECKBOX "退格键智能删除空格(&B)",IDC_BACKSPACE_SMARTDEL,7,159,160,10,WS_TABSTOP
AUTOCHECKBOX "自动检查制表符和缩进设置(&C)",IDC_DETECT_INDENTATION,7,171,160,10,WS_TABSTOP
DEFPUSHBUTTON "确定",IDOK,119,188,50,14
PUSHBUTTON "取消",IDCANCEL,175,188,50,14
END

IDD_LONGLINES DIALOGEX 0, 0, 184, 55
Expand Down
9 changes: 5 additions & 4 deletions locale/zh-Hant/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP3,7,217,10,10
END

IDD_TABSETTINGS DIALOGEX 0, 0, 232, 197
IDD_TABSETTINGS DIALOGEX 0, 0, 232, 209
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Tab 設定"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
Expand All @@ -1352,9 +1352,10 @@ BEGIN
AUTOCHECKBOX "使用檔案類型設定(&M)",IDC_FILE_USE_SCHEME_TAB,118,114,101,10,WS_TABSTOP
AUTOCHECKBOX "Tab 鍵重新格式化縮排(&K)",IDC_TAB_INDENT,7,135,160,10,WS_TABSTOP
AUTOCHECKBOX "退格鍵重新格式化縮排(&B)",IDC_BACKSPACE_UNINDENT,7,147,160,10,WS_TABSTOP
AUTOCHECKBOX "自動檢查 Tab 和縮進設置(&C)",IDC_DETECT_INDENTATION,7,159,160,10,WS_TABSTOP
DEFPUSHBUTTON "確定",IDOK,119,176,50,14
PUSHBUTTON "取消",IDCANCEL,175,176,50,14
AUTOCHECKBOX "倒退鍵智慧刪除空格(&B)",IDC_BACKSPACE_SMARTDEL,7,159,160,10,WS_TABSTOP
AUTOCHECKBOX "自動檢查 Tab 和縮進設置(&C)",IDC_DETECT_INDENTATION,7,171,160,10,WS_TABSTOP
DEFPUSHBUTTON "確定",IDOK,119,188,50,14
PUSHBUTTON "取消",IDCANCEL,175,188,50,14
END

IDD_LONGLINES DIALOGEX 0, 0, 184, 55
Expand Down
2 changes: 1 addition & 1 deletion scintilla/src/Document.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ class Document : PerLine, public Scintilla::IDocument, public Scintilla::ILoader
int actualIndentInChars;
bool useTabs;
bool tabIndents;
bool backspaceUnindents;
uint8_t backspaceUnindents;
ActionDuration durationStyleOneUnit;

std::unique_ptr<IDecorationList> decorations;
Expand Down
6 changes: 3 additions & 3 deletions scintilla/src/Editor.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2378,12 +2378,12 @@ bool Editor::BackspaceUnindent(Sci::Position lineCurrentPos, Sci::Position caret
if (indentationChange == 0) {
indentationChange = indentationStep;
}
if (column <= indentation && pdoc->backspaceUnindents) {
if (column <= indentation && (pdoc->backspaceUnindents & 1)) {
//const UndoGroup ugInner(pdoc, !ug.Needed());
*posSelect = pdoc->SetLineIndentation(lineCurrentPos, indentation - indentationChange);
return true;
}
if (indentationChange > 1) {
if (indentationChange > 1 && (pdoc->backspaceUnindents & 2)) {
const Sci_Position minPos = std::max(lineCurrentPos, caretPosition - indentationChange);
Sci::Position pos = caretPosition - 1;
while (pos >= minPos && pdoc->CharAt(pos) == ' ') {
Expand Down Expand Up @@ -6857,7 +6857,7 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
return pdoc->tabIndents;

case Message::SetBackSpaceUnIndents:
pdoc->backspaceUnindents = wParam != 0;
pdoc->backspaceUnindents = static_cast<uint8_t>(wParam);
break;

case Message::GetBackSpaceUnIndents:
Expand Down
8 changes: 7 additions & 1 deletion src/Dialogs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1684,7 +1684,10 @@ static INT_PTR CALLBACK TabSettingsDlgProc(HWND hwnd, UINT umsg, WPARAM wParam,
if (fvCurFile.bTabIndents) {
CheckDlgButton(hwnd, IDC_TAB_INDENT, BST_CHECKED);
}
if (tabSettings.bBackspaceUnindents) {
if (tabSettings.bBackspaceUnindents & 2) {
CheckDlgButton(hwnd, IDC_BACKSPACE_SMARTDEL, BST_CHECKED);
}
if (tabSettings.bBackspaceUnindents & 1) {
CheckDlgButton(hwnd, IDC_BACKSPACE_UNINDENT, BST_CHECKED);
}
if (tabSettings.bDetectIndentation) {
Expand Down Expand Up @@ -1759,6 +1762,9 @@ static INT_PTR CALLBACK TabSettingsDlgProc(HWND hwnd, UINT umsg, WPARAM wParam,
fvCurFile.bTabIndents = IsButtonChecked(hwnd, IDC_TAB_INDENT);
tabSettings.bTabIndents = fvCurFile.bTabIndents;
tabSettings.bBackspaceUnindents = IsButtonChecked(hwnd, IDC_BACKSPACE_UNINDENT);
if (IsButtonChecked(hwnd, IDC_BACKSPACE_SMARTDEL)) {
tabSettings.bBackspaceUnindents |= 2;
}
tabSettings.bDetectIndentation = IsButtonChecked(hwnd, IDC_DETECT_INDENTATION);
Style_SaveTabSettings(pLexCurrent);
EndDialog(hwnd, IDOK);
Expand Down
2 changes: 1 addition & 1 deletion src/Edit.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ typedef struct EditTabSettings {
int globalIndentWidth;
bool globalTabsAsSpaces;
bool bTabIndents;
bool bBackspaceUnindents;
uint8_t bBackspaceUnindents;
bool bDetectIndentation;

int schemeTabWidth;
Expand Down
4 changes: 2 additions & 2 deletions src/Notepad2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5613,7 +5613,7 @@ void LoadSettings(void) {
tabSettings.globalIndentWidth = clamp_i(iValue, INDENT_WIDTH_MIN, INDENT_WIDTH_MAX);
tabSettings.globalTabsAsSpaces = IniSectionGetBool(pIniSection, L"TabsAsSpaces", false);
tabSettings.bTabIndents = IniSectionGetBool(pIniSection, L"TabIndents", true);
tabSettings.bBackspaceUnindents = IniSectionGetBool(pIniSection, L"BackspaceUnindents", false);
tabSettings.bBackspaceUnindents = (uint8_t)IniSectionGetInt(pIniSection, L"BackspaceUnindents", 2);
tabSettings.bDetectIndentation = IniSectionGetBool(pIniSection, L"DetectIndentation", true);
// for toolbar state
fvCurFile.bTabsAsSpaces = tabSettings.globalTabsAsSpaces;
Expand Down Expand Up @@ -5942,7 +5942,7 @@ void SaveSettings(bool bSaveSettingsNow) {
IniSectionSetIntEx(pIniSection, L"IndentWidth", tabSettings.globalIndentWidth, INDENT_WIDTH_4);
IniSectionSetBoolEx(pIniSection, L"TabsAsSpaces", tabSettings.globalTabsAsSpaces, false);
IniSectionSetBoolEx(pIniSection, L"TabIndents", tabSettings.bTabIndents, true);
IniSectionSetBoolEx(pIniSection, L"BackspaceUnindents", tabSettings.bBackspaceUnindents, false);
IniSectionSetIntEx(pIniSection, L"BackspaceUnindents", tabSettings.bBackspaceUnindents, 2);
IniSectionSetBoolEx(pIniSection, L"DetectIndentation", tabSettings.bDetectIndentation, true);
IniSectionSetBoolEx(pIniSection, L"MarkLongLines", bMarkLongLines, false);
IniSectionSetIntEx(pIniSection, L"LongLinesLimit", iLongLinesLimitG, 80);
Expand Down
9 changes: 5 additions & 4 deletions src/Notepad2.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ BEGIN
SCROLLBAR IDC_RESIZEGRIP3,7,217,10,10
END

IDD_TABSETTINGS DIALOGEX 0, 0, 232, 197
IDD_TABSETTINGS DIALOGEX 0, 0, 232, 209
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Tab Settings"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
Expand All @@ -1352,9 +1352,10 @@ BEGIN
AUTOCHECKBOX "Use sche&me settings.",IDC_FILE_USE_SCHEME_TAB,118,114,101,10,WS_TABSTOP
AUTOCHECKBOX "Tab &key reformats indentation.",IDC_TAB_INDENT,7,135,160,10,WS_TABSTOP
AUTOCHECKBOX "&Backspace key reformats indentation.",IDC_BACKSPACE_UNINDENT,7,147,160,10,WS_TABSTOP
AUTOCHECKBOX "Auto dete&ct Tab and indentation settings.",IDC_DETECT_INDENTATION,7,159,160,10,WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,119,176,50,14
PUSHBUTTON "Cancel",IDCANCEL,175,176,50,14
AUTOCHECKBOX "Backspace key sma&rt delete spaces.",IDC_BACKSPACE_SMARTDEL,7,159,160,10,WS_TABSTOP
AUTOCHECKBOX "Auto dete&ct Tab and indentation settings.",IDC_DETECT_INDENTATION,7,171,160,10,WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,119,188,50,14
PUSHBUTTON "Cancel",IDCANCEL,175,188,50,14
END

IDD_LONGLINES DIALOGEX 0, 0, 184, 55
Expand Down
2 changes: 1 addition & 1 deletion src/SciCall.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ NP2_inline void SciCall_SetTabIndents(bool tabIndents) NP2_noexcept {
SciCall(SCI_SETTABINDENTS, tabIndents, 0);
}

NP2_inline void SciCall_SetBackSpaceUnIndents(bool bsUnIndents) NP2_noexcept {
NP2_inline void SciCall_SetBackSpaceUnIndents(uint8_t bsUnIndents) NP2_noexcept {
SciCall(SCI_SETBACKSPACEUNINDENTS, bsUnIndents, 0);
}

Expand Down
1 change: 1 addition & 0 deletions src/resource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@
#define IDC_TAB_INDENT 130
#define IDC_BACKSPACE_UNINDENT 131
#define IDC_DETECT_INDENTATION 132
#define IDC_BACKSPACE_SMARTDEL 133
// Long Lines
#define IDD_LONGLINES 123
#define IDC_LONGLINE_LIMIT 100
Expand Down

0 comments on commit 5f0c078

Please sign in to comment.