diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d79be6..1407566 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -310,11 +310,6 @@ if(BUILD_TESTING) endif() add_test(NAME test_type_selector COMMAND test_type_selector) - add_executable(test_theme tests/test_theme.cpp - src/themes/theme.cpp src/themes/thememanager.cpp) - target_include_directories(test_theme PRIVATE src) - target_link_libraries(test_theme PRIVATE ${QT}::Widgets ${QT}::Test) - add_test(NAME test_theme COMMAND test_theme) add_executable(test_options_dialog tests/test_options_dialog.cpp src/optionsdialog.cpp src/themes/theme.cpp src/themes/thememanager.cpp) diff --git a/screenshot.png b/screenshot.png index 9ec25b3..dece2ba 100644 Binary files a/screenshot.png and b/screenshot.png differ diff --git a/src/editor.cpp b/src/editor.cpp index 19e39d9..63c7c4e 100644 --- a/src/editor.cpp +++ b/src/editor.cpp @@ -325,7 +325,8 @@ RcxEditor::RcxEditor(QWidget* parent) : QWidget(parent) { } return; } - int line = m_sci->lineAt(pos); + HitInfo hi = hitTest(pos); + int line = hi.line; int nodeIdx = -1; int subLine = 0; if (line >= 0 && line < m_meta.size()) { diff --git a/src/themes/defaults/mid.json b/src/themes/defaults/mid.json new file mode 100644 index 0000000..9b90ede --- /dev/null +++ b/src/themes/defaults/mid.json @@ -0,0 +1,32 @@ +{ + "name": "Mid", + "background": "#0D1219", + "backgroundAlt": "#121720", + "surface": "#161C28", + "border": "#1E2636", + "borderFocused": "#485068", + "button": "#181E2C", + "text": "#B0B8CC", + "textDim": "#505C74", + "textMuted": "#384258", + "textFaint": "#2C3448", + "hover": "#121720", + "selected": "#121720", + "selection": "#1A2038", + "syntaxKeyword": "#5688C0", + "syntaxNumber": "#90B480", + "syntaxString": "#B88060", + "syntaxComment": "#385030", + "syntaxPreproc": "#9868A8", + "syntaxType": "#8FDBFE", + "indHoverSpan": "#C09038", + "indCmdPill": "#141A26", + "indDataChanged": "#608C54", + "indHeatCold": "#B09030", + "indHeatWarm": "#C09038", + "indHeatHot": "#C83838", + "indHintGreen": "#385830", + "markerPtr": "#C83838", + "markerCycle": "#B89028", + "markerError": "#481818" +}