aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
authorGravatar mitchell <70453897+667e-11@users.noreply.github.com>2013-09-16 20:49:23 -0400
committerGravatar mitchell <70453897+667e-11@users.noreply.github.com>2013-09-16 20:49:23 -0400
commitdbef5c3fa8ca9f842f75a6db1f0aa0fb029a4be6 (patch)
treec215e7a3ae04be1343820a2577543f8154c28580 /themes
parent9ccea9e562699b45ba830b8b1355571061580386 (diff)
Moved custom markers and indicators into themes and added more properties.
Diffstat (limited to 'themes')
-rw-r--r--themes/dark.lua25
-rw-r--r--themes/light.lua21
-rw-r--r--themes/term.lua9
3 files changed, 42 insertions, 13 deletions
diff --git a/themes/dark.lua b/themes/dark.lua
index a446e9b6..6db08dfc 100644
--- a/themes/dark.lua
+++ b/themes/dark.lua
@@ -27,7 +27,7 @@ property['color.dark_white'] = 0xCCCCCC
--property['color.dark_orange'] = 0x1A66B3
--property['color.dark_pink'] = 0x6666B3
--property['color.dark_lavender'] = 0xB36666
---property['color.dark_blue'] = 0xB3661A
+property['color.dark_blue'] = 0xB3661A
-- Normal colors.
property['color.red'] = 0x4D4D99
@@ -106,13 +106,22 @@ buffer.caret_line_back = property_int['color.light_black']
buffer:set_fold_margin_colour(true, property_int['color.black'])
buffer:set_fold_margin_hi_colour(true, property_int['color.black'])
--- Fold Margin Markers.
-buffer.marker_fore[buffer.SC_MARKNUM_FOLDEROPEN] =
- property_int['color.dark_grey']
-buffer.marker_back[buffer.SC_MARKNUM_FOLDEROPEN] =
- property_int['color.dark_grey']
-buffer.marker_fore[buffer.SC_MARKNUM_FOLDER] = property_int['color.dark_grey']
-buffer.marker_back[buffer.SC_MARKNUM_FOLDER] = property_int['color.dark_grey']
+-- Markers.
+local MARK_BOOKMARK = textadept.bookmarks.MARK_BOOKMARK
+buffer.marker_fore[MARK_BOOKMARK] = property_int['color.black']
+buffer.marker_back[MARK_BOOKMARK] = property_int['color.dark_blue']
+buffer.marker_fore[textadept.run.MARK_ERROR] = property_int['color.black']
+buffer.marker_back[textadept.run.MARK_ERROR] = property_int['color.red']
+for i = 25, 31 do -- fold margin markers
+ buffer.marker_fore[i] = property_int['color.black']
+ buffer.marker_back[i] = property_int['color.dark_grey']
+ buffer.marker_back_selected[i] = property_int['color.light_grey']
+end
+
+-- Indicators.
+local INDIC_HIGHLIGHT = textadept.editing.INDIC_HIGHLIGHT
+buffer.indic_fore[INDIC_HIGHLIGHT] = property_int['color.orange']
+buffer.indic_alpha[INDIC_HIGHLIGHT] = 255
-- Long Lines.
buffer.edge_colour = property_int['color.dark_grey']
diff --git a/themes/light.lua b/themes/light.lua
index dc6daf1c..5b7baca0 100644
--- a/themes/light.lua
+++ b/themes/light.lua
@@ -106,11 +106,22 @@ buffer.caret_line_back = property_int['color.dark_white']
buffer:set_fold_margin_colour(true, property_int['color.white'])
buffer:set_fold_margin_hi_colour(true, property_int['color.white'])
--- Fold Margin Markers.
-buffer.marker_fore[buffer.SC_MARKNUM_FOLDEROPEN] = property_int['color.grey']
-buffer.marker_back[buffer.SC_MARKNUM_FOLDEROPEN] = property_int['color.grey']
-buffer.marker_fore[buffer.SC_MARKNUM_FOLDER] = property_int['color.grey']
-buffer.marker_back[buffer.SC_MARKNUM_FOLDER] = property_int['color.grey']
+-- Markers.
+local MARK_BOOKMARK = textadept.bookmarks.MARK_BOOKMARK
+buffer.marker_fore[MARK_BOOKMARK] = property_int['color.white']
+buffer.marker_back[MARK_BOOKMARK] = property_int['color.dark_blue']
+buffer.marker_fore[textadept.run.MARK_ERROR] = property_int['color.white']
+buffer.marker_back[textadept.run.MARK_ERROR] = property_int['color.light_red']
+for i = 25, 31 do -- fold margin markers
+ buffer.marker_fore[i] = property_int['color.white']
+ buffer.marker_back[i] = property_int['color.grey']
+ buffer.marker_back_selected[i] = property_int['color.grey_black']
+end
+
+-- Indicators.
+local INDIC_HIGHLIGHT = textadept.editing.INDIC_HIGHLIGHT
+buffer.indic_fore[INDIC_HIGHLIGHT] = property_int['color.orange']
+buffer.indic_alpha[INDIC_HIGHLIGHT] = 255
-- Long Lines.
buffer.edge_colour = property_int['color.grey']
diff --git a/themes/term.lua b/themes/term.lua
index 9f530723..bccd2686 100644
--- a/themes/term.lua
+++ b/themes/term.lua
@@ -73,5 +73,14 @@ property['style.whitespace'] = ''
--buffer:set_fold_margin_colour(true, property_int['color.white'])
--buffer:set_fold_margin_hi_colour(true, property_int['color.white'])
+-- Markers.
+local MARK_BOOKMARK = textadept.bookmarks.MARK_BOOKMARK
+buffer.marker_back[MARK_BOOKMARK] = property_int['color.blue']
+buffer.marker_back[textadept.run.MARK_ERROR] = property_int['color.red']
+
+-- Indicators.
+local INDIC_HIGHLIGHT = textadept.editing.INDIC_HIGHLIGHT
+buffer.indic_fore[INDIC_HIGHLIGHT] = property_int['color.yellow']
+
-- Long Lines.
buffer.edge_colour = property_int['color.white']