mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-05-16 14:16:09 -06:00
fixed border line
This commit is contained in:
Mirek Fidler
parent
a2cf7058e5
commit
0777dada65
8 changed files with 36 additions and 37 deletions
|
|
@ -196,6 +196,7 @@ void HighlightSetup::DarkTheme(bool host)
|
|||
SetHlStyle(PAPER_WARNING, Color(21, 21, 0));
|
||||
SetHlStyle(SHOW_LINE, Color(27, 75, 26));
|
||||
SetHlStyle(SHOW_COLUMN, Color(56, 33, 29));
|
||||
SetHlStyle(SHOW_BORDER, Color(70, 50, 50));
|
||||
SetHlStyle(WHITESPACE, Color(68, 128, 176));
|
||||
SetHlStyle(WARN_WHITESPACE, Color(206, 141, 141));
|
||||
|
||||
|
|
@ -261,6 +262,7 @@ void HighlightSetup::WhiteTheme(bool host)
|
|||
|
||||
SetHlStyle(SHOW_LINE, Color(199, 247, 198));
|
||||
SetHlStyle(SHOW_COLUMN, Color(247, 224, 220));
|
||||
SetHlStyle(SHOW_BORDER, Color(250, 220, 220));
|
||||
|
||||
SetHlStyle(INK_NORMAL, Black());
|
||||
SetHlStyle(INK_DISABLED, Color(109, 109, 109));
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ HL_COLOR(PAPER_ERROR_FILE, t_("Current file errors"), 0)
|
|||
HL_COLOR(PAPER_WARNING, t_("Warning in compiler messages"), 0)
|
||||
HL_COLOR(SHOW_LINE, t_("Current line highlight"), 0)
|
||||
HL_COLOR(SHOW_COLUMN, t_("Current column highlight"), 0)
|
||||
HL_COLOR(SHOW_BORDER, t_("Border column highlight"), 0)
|
||||
|
||||
HL_COLOR(WHITESPACE, t_("Whitespaces"), 1)
|
||||
HL_COLOR(WARN_WHITESPACE, t_("Misplaced tabs and spaces"), 1)
|
||||
|
|
|
|||
|
|
@ -352,7 +352,6 @@ Color DarkThemeCached(Color c)
|
|||
thread_local struct Cache {
|
||||
Color icolor[N];
|
||||
Color ocolor[N];
|
||||
int ii = 0;
|
||||
|
||||
Cache() {
|
||||
for(int i = 0; i < N; i++) {
|
||||
|
|
|
|||
|
|
@ -295,7 +295,8 @@ void Ide::Serialize(Stream& s)
|
|||
}
|
||||
s % editor.commentdp;
|
||||
s % bordercolumn;
|
||||
s % bordercolor;
|
||||
Color dummy_color;
|
||||
s % dummy_color;
|
||||
if(version >= 20)
|
||||
s % find_pick_sel % find_pick_text % deactivate_save;
|
||||
s % hydra1_threads;
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ void Ide::UpdateFormat(CodeEditor& editor)
|
|||
editor.LineNumbers(line_numbers);
|
||||
editor.AutoEnclose(auto_enclose);
|
||||
editor.MarkLines(mark_lines);
|
||||
editor.BorderColumn(bordercolumn, bordercolor);
|
||||
editor.BorderColumn(bordercolumn, this->editor.GetHlStyle(CodeEditor::SHOW_BORDER).color);
|
||||
editor.PersistentFindReplace(persistent_find_replace);
|
||||
editor.FindReplaceRestorePos(find_replace_restore_pos);
|
||||
editor.Refresh();
|
||||
|
|
@ -381,6 +381,7 @@ void Ide::SetupFormat() {
|
|||
(hlt.thousands_separator, thousands_separator)
|
||||
(hlt.hline, hline)
|
||||
(hlt.vline, vline)
|
||||
(hlt.bordercolumn, bordercolumn)
|
||||
(hlt.hl_custom, hl_custom)
|
||||
|
||||
(edt.indent_spaces, indent_spaces)
|
||||
|
|
@ -391,8 +392,6 @@ void Ide::SetupFormat() {
|
|||
(edt.lineends, line_endings)
|
||||
(edt.numbers, line_numbers)
|
||||
(edt.bookmark_pos, bookmark_pos)
|
||||
(edt.bordercolumn, bordercolumn)
|
||||
(edt.bordercolor, bordercolor)
|
||||
(edt.findpicksel, find_pick_sel)
|
||||
(edt.findpicktext, find_pick_text)
|
||||
(edt.deactivate_save, deactivate_save)
|
||||
|
|
|
|||
|
|
@ -641,7 +641,6 @@ public:
|
|||
bool deactivate_save;
|
||||
int insert_include;
|
||||
int bordercolumn;
|
||||
Color bordercolor;
|
||||
bool persistent_find_replace;
|
||||
bool find_replace_restore_pos;
|
||||
int spellcheck_comments;
|
||||
|
|
|
|||
|
|
@ -530,8 +530,8 @@ LAYOUT(SetupFontLayout, 528, 312)
|
|||
ITEM(Upp::Button, defaults, SetLabel(t_("Restore defaults")).RightPosZ(8, 116).BottomPosZ(4, 24))
|
||||
END_LAYOUT
|
||||
|
||||
LAYOUT(SetupHlLayout, 544, 344)
|
||||
ITEM(Upp::ArrayCtrl, hlstyle, LeftPosZ(4, 360).VSizePosZ(4, 8))
|
||||
LAYOUT(SetupHlLayout, 544, 364)
|
||||
ITEM(Upp::ArrayCtrl, hlstyle, LeftPosZ(4, 360).VSizePosZ(4, 4))
|
||||
ITEM(Upp::Label, dv___1, SetLabel(t_("Scope highlighting")).LeftPosZ(372, 160).TopPosZ(4, 16))
|
||||
ITEM(Upp::Switch, hilite_scope, SetLabel(t_("None\n2 colors\n5 colors")).LeftPosZ(372, 188).TopPosZ(20, 20))
|
||||
ITEM(Upp::Label, dv___3, SetLabel(t_("Matching bracket highlighting")).LeftPosZ(372, 160).TopPosZ(52, 16))
|
||||
|
|
@ -542,11 +542,13 @@ LAYOUT(SetupHlLayout, 544, 344)
|
|||
ITEM(Upp::Option, thousands_separator, SetLabel(t_("Thousands separator")).LeftPosZ(372, 160).TopPosZ(200, 18))
|
||||
ITEM(Upp::Option, hline, SetLabel(t_("Line")).LeftPosZ(432, 160).TopPosZ(224, 18))
|
||||
ITEM(Upp::Option, vline, SetLabel(t_("Column")).LeftPosZ(472, 84).TopPosZ(224, 18))
|
||||
ITEM(Upp::Button, hl_restore, SetLabel(t_("Restore default colors")).HSizePosZ(368, 4).BottomPosZ(56, 20))
|
||||
ITEM(Upp::Button, hl_restore_dark, SetLabel(t_("Dark theme")).HSizePosZ(368, 4).BottomPosZ(8, 20))
|
||||
ITEM(Upp::Button, hl_restore_white, SetLabel(t_("White theme")).HSizePosZ(368, 4).BottomPosZ(32, 20))
|
||||
ITEM(Upp::Button, hl_restore, SetLabel(t_("Restore default colors")).HSizePosZ(368, 4).BottomPosZ(52, 20))
|
||||
ITEM(Upp::Button, hl_restore_dark, SetLabel(t_("Dark theme")).HSizePosZ(368, 4).BottomPosZ(4, 20))
|
||||
ITEM(Upp::Button, hl_restore_white, SetLabel(t_("White theme")).HSizePosZ(368, 4).BottomPosZ(28, 20))
|
||||
ITEM(Upp::Label, dv___14, SetLabel(t_("Current")).LeftPosZ(372, 40).TopPosZ(224, 18))
|
||||
ITEM(Upp::Option, hl_custom, SetLabel(t_("Custom colors")).LeftPosZ(372, 172).TopPosZ(248, 16))
|
||||
ITEM(Upp::Option, hl_custom, SetLabel(t_("Custom colors")).LeftPosZ(372, 172).VSizePosZ(272, 76))
|
||||
ITEM(Upp::Label, dv___16, SetLabel(t_("Paint line at column")).HSizePosZ(372, 64).TopPosZ(248, 19))
|
||||
ITEM(Upp::EditIntSpin, bordercolumn, Min(0).LeftPosZ(484, 52).TopPosZ(248, 19))
|
||||
END_LAYOUT
|
||||
|
||||
LAYOUT(SetupEditorLayout, 544, 344)
|
||||
|
|
@ -554,37 +556,34 @@ LAYOUT(SetupEditorLayout, 544, 344)
|
|||
ITEM(Upp::EditIntSpin, tabsize, LeftPosZ(116, 52).TopPosZ(4, 19))
|
||||
ITEM(Upp::Label, dv___2, SetLabel(t_("Indent")).LeftPosZ(4, 108).TopPosZ(24, 19))
|
||||
ITEM(Upp::EditIntSpin, indent_amount, LeftPosZ(116, 52).TopPosZ(24, 19))
|
||||
ITEM(Upp::Label, dv___4, SetLabel(t_("Paint line at column")).HSizePosZ(4, 432).TopPosZ(44, 19))
|
||||
ITEM(Upp::EditIntSpin, bordercolumn, Min(0).LeftPosZ(116, 52).TopPosZ(44, 19))
|
||||
ITEM(Upp::ColorPusher, bordercolor, LeftPosZ(172, 48).TopPosZ(44, 20))
|
||||
ITEM(Upp::Label, dv___7, SetLabel(t_("Default charset")).LeftPosZ(4, 108).TopPosZ(64, 19))
|
||||
ITEM(Upp::DropList, charset, LeftPosZ(116, 104).TopPosZ(64, 19))
|
||||
ITEM(Upp::Label, dv___9, SetLabel(t_("Line endings")).LeftPosZ(4, 108).TopPosZ(84, 19))
|
||||
ITEM(Upp::DropList, lineends, LeftPosZ(116, 160).TopPosZ(84, 19))
|
||||
ITEM(Upp::Option, showtabs, SetLabel(t_("Show tabs and line endings")).LeftPosZ(4, 272).TopPosZ(108, 16))
|
||||
ITEM(Upp::Option, showspaces, SetLabel(t_("Show spaces")).LeftPosZ(4, 272).TopPosZ(124, 16))
|
||||
ITEM(Upp::Option, warnwhitespace, SetLabel(t_("Show possibly misplaced tabs and spaces")).LeftPosZ(4, 272).TopPosZ(140, 16))
|
||||
ITEM(Upp::Option, indent_spaces, SetLabel(t_("Indent using spaces")).HSizePosZ(4, 268).TopPosZ(156, 16))
|
||||
ITEM(Upp::Option, no_parenthesis_indent, SetLabel(t_("No indent after parenthesis")).LeftPosZ(4, 272).TopPosZ(172, 16))
|
||||
ITEM(Upp::Option, numbers, SetLabel(t_("Show line numbers")).LeftPosZ(4, 272).TopPosZ(188, 16))
|
||||
ITEM(Upp::Option, bookmark_pos, SetLabel(t_("Bookmarks restore position")).LeftPosZ(4, 272).TopPosZ(204, 16))
|
||||
ITEM(Upp::Option, findpicksel, SetLabel(t_("Find picks selection")).LeftPosZ(4, 272).TopPosZ(220, 16))
|
||||
ITEM(Upp::Option, findpicktext, SetLabel(t_("Find picks selection or text")).LeftPosZ(4, 272).TopPosZ(236, 16))
|
||||
ITEM(Upp::Option, deactivate_save, SetLabel(t_("Save file on TheIde window deactivation")).LeftPosZ(4, 272).TopPosZ(252, 16))
|
||||
ITEM(Upp::Option, persistent_find_replace, SetLabel(t_("Do not close Find/Replace dialog automatically")).LeftPosZ(4, 272).TopPosZ(268, 16))
|
||||
ITEM(Upp::Option, find_replace_restore_pos, SetLabel(t_("Restore position on canceling incremental search")).LeftPosZ(4, 272).TopPosZ(284, 16))
|
||||
ITEM(Upp::Option, block_caret, SetLabel(t_("Full block caret")).LeftPosZ(4, 272).TopPosZ(300, 16))
|
||||
ITEM(Upp::Option, bar_branch, SetLabel(t_("Show git branch in editor bar")).LeftPosZ(4, 372).TopPosZ(316, 16))
|
||||
ITEM(Upp::Label, dv___4, SetLabel(t_("Default charset")).LeftPosZ(4, 108).TopPosZ(44, 19))
|
||||
ITEM(Upp::DropList, charset, LeftPosZ(116, 104).TopPosZ(44, 19))
|
||||
ITEM(Upp::Label, dv___6, SetLabel(t_("Line endings")).LeftPosZ(4, 108).TopPosZ(64, 19))
|
||||
ITEM(Upp::DropList, lineends, LeftPosZ(116, 160).TopPosZ(64, 19))
|
||||
ITEM(Upp::Option, showtabs, SetLabel(t_("Show tabs and line endings")).LeftPosZ(4, 272).TopPosZ(88, 16))
|
||||
ITEM(Upp::Option, showspaces, SetLabel(t_("Show spaces")).LeftPosZ(4, 272).TopPosZ(104, 16))
|
||||
ITEM(Upp::Option, warnwhitespace, SetLabel(t_("Show possibly misplaced tabs and spaces")).LeftPosZ(4, 272).TopPosZ(120, 16))
|
||||
ITEM(Upp::Option, indent_spaces, SetLabel(t_("Indent using spaces")).HSizePosZ(4, 268).TopPosZ(136, 16))
|
||||
ITEM(Upp::Option, no_parenthesis_indent, SetLabel(t_("No indent after parenthesis")).LeftPosZ(4, 272).TopPosZ(152, 16))
|
||||
ITEM(Upp::Option, numbers, SetLabel(t_("Show line numbers")).LeftPosZ(4, 272).TopPosZ(168, 16))
|
||||
ITEM(Upp::Option, bookmark_pos, SetLabel(t_("Bookmarks restore position")).LeftPosZ(4, 272).TopPosZ(184, 16))
|
||||
ITEM(Upp::Option, findpicksel, SetLabel(t_("Find picks selection")).LeftPosZ(4, 272).TopPosZ(200, 16))
|
||||
ITEM(Upp::Option, findpicktext, SetLabel(t_("Find picks selection or text")).LeftPosZ(4, 272).TopPosZ(216, 16))
|
||||
ITEM(Upp::Option, deactivate_save, SetLabel(t_("Save file on TheIde window deactivation")).LeftPosZ(4, 272).TopPosZ(232, 16))
|
||||
ITEM(Upp::Option, persistent_find_replace, SetLabel(t_("Do not close Find/Replace dialog automatically")).LeftPosZ(4, 272).TopPosZ(248, 16))
|
||||
ITEM(Upp::Option, find_replace_restore_pos, SetLabel(t_("Restore position on canceling incremental search")).LeftPosZ(4, 272).TopPosZ(264, 16))
|
||||
ITEM(Upp::Option, block_caret, SetLabel(t_("Full block caret")).LeftPosZ(4, 272).TopPosZ(280, 16))
|
||||
ITEM(Upp::Option, bar_branch, SetLabel(t_("Show git branch in editor bar")).LeftPosZ(4, 272).TopPosZ(296, 16))
|
||||
ITEM(Upp::Option, wordwrap_comments, SetLabel(t_("Wordwrap comments")).LeftPosZ(304, 224).TopPosZ(140, 16))
|
||||
ITEM(Upp::Label, dv___26, SetLabel(t_("File Tabs")).LeftPosZ(304, 64).TopPosZ(4, 19))
|
||||
ITEM(Upp::Label, dv___23, SetLabel(t_("File Tabs")).LeftPosZ(304, 64).TopPosZ(4, 19))
|
||||
ITEM(Upp::DropList, filetabs, LeftPosZ(372, 64).TopPosZ(4, 19))
|
||||
ITEM(Upp::Label, dv___28, SetLabel(t_("Crosses")).LeftPosZ(304, 64).TopPosZ(24, 19))
|
||||
ITEM(Upp::Label, dv___25, SetLabel(t_("Crosses")).LeftPosZ(304, 64).TopPosZ(24, 19))
|
||||
ITEM(Upp::DropList, tabs_crosses, LeftPosZ(372, 64).TopPosZ(24, 19))
|
||||
ITEM(Upp::Option, tabs_icons, SetLabel(t_("Icons")).LeftPosZ(304, 132).TopPosZ(44, 16))
|
||||
ITEM(Upp::Option, tabs_grouping, SetLabel(t_("Group by file folders")).LeftPosZ(304, 132).TopPosZ(60, 16))
|
||||
ITEM(Upp::Option, tabs_stacking, SetLabel(t_("Stacking")).LeftPosZ(304, 132).TopPosZ(76, 16))
|
||||
ITEM(Upp::Option, tabs_serialize, SetLabel(t_("Persistent tabs")).LeftPosZ(304, 132).TopPosZ(92, 16))
|
||||
ITEM(Upp::Label, dv___34, SetLabel(t_("Spellcheck comments")).LeftPosZ(304, 120).TopPosZ(116, 19))
|
||||
ITEM(Upp::Label, dv___31, SetLabel(t_("Spellcheck comments")).LeftPosZ(304, 120).TopPosZ(116, 19))
|
||||
ITEM(Upp::DropList, spellcheck_comments, LeftPosZ(428, 92).TopPosZ(116, 19))
|
||||
END_LAYOUT
|
||||
|
||||
|
|
|
|||
|
|
@ -579,7 +579,6 @@ Ide::Ide()
|
|||
editor.NoCutLine();
|
||||
|
||||
bordercolumn = 96;
|
||||
bordercolor = SColorFace();
|
||||
|
||||
state_icon = -1;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue