diff --git a/src/audio_box.cpp b/src/audio_box.cpp index dea20cd310..69807b4abb 100644 --- a/src/audio_box.cpp +++ b/src/audio_box.cpp @@ -61,7 +61,7 @@ AudioBox::AudioBox(wxWindow *parent, agi::Context *context) , controller(context->audioController.get()) , context(context) , audio_open_connection(context->audioController->AddAudioPlayerOpenListener(&AudioBox::OnAudioOpen, this)) -, panel(new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxBORDER_RAISED)) +, panel(new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | (OPT_GET("App/Dark Mode")->GetBool() ? wxBORDER_SIMPLE : wxBORDER_RAISED))) , audioDisplay(new AudioDisplay(panel, context->audioController.get(), context)) , HorizontalZoom(new wxSlider(panel, Audio_Horizontal_Zoom, -OPT_GET("Audio/Zoom/Horizontal")->GetInt(), -50, 30, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL|wxSL_BOTH)) , VerticalZoom(new wxSlider(panel, Audio_Vertical_Zoom, OPT_GET("Audio/Zoom/Vertical")->GetInt(), 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL|wxSL_BOTH|wxSL_INVERSE)) diff --git a/src/base_grid.cpp b/src/base_grid.cpp index 151b15be03..8a8ac9b933 100644 --- a/src/base_grid.cpp +++ b/src/base_grid.cpp @@ -61,7 +61,7 @@ enum { }; BaseGrid::BaseGrid(wxWindow* parent, agi::Context *context) -: wxWindow(parent, -1, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS | wxSUNKEN_BORDER) +: wxWindow(parent, -1, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS | (OPT_GET("App/Dark Mode")->GetBool() ? wxBORDER_SIMPLE : wxSUNKEN_BORDER)) , scrollBar(new wxScrollBar(this, GRID_SCROLLBAR, wxDefaultPosition, wxDefaultSize, wxSB_VERTICAL)) , context(context) , columns(GetGridColumns()) diff --git a/src/dialog_colorpicker.cpp b/src/dialog_colorpicker.cpp index d7bba83b97..e4358257dd 100644 --- a/src/dialog_colorpicker.cpp +++ b/src/dialog_colorpicker.cpp @@ -583,7 +583,7 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, agi::Color initial_color, eyedropper_bitmap = GETIMAGE(eyedropper_tool_24); eyedropper_bitmap.SetMask(new wxMask(eyedropper_bitmap, wxColour(255, 0, 255))); - screen_dropper_icon = new wxStaticBitmap(this, -1, eyedropper_bitmap, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER); + screen_dropper_icon = new wxStaticBitmap(this, -1, eyedropper_bitmap, wxDefaultPosition, wxDefaultSize, (OPT_GET("App/Dark Mode")->GetBool() ? wxBORDER_SIMPLE : wxRAISED_BORDER)); screen_dropper = new ColorPickerScreenDropper(this, 7, 7, 8); // Arrange the controls in a nice way diff --git a/src/dialog_progress.cpp b/src/dialog_progress.cpp index bcf4de96d6..52bded61c3 100644 --- a/src/dialog_progress.cpp +++ b/src/dialog_progress.cpp @@ -20,6 +20,7 @@ #include "dialog_progress.h" #include "compat.h" +#include "options.h" #include "utils.h" #include @@ -112,7 +113,7 @@ class DialogProgressSink final : public agi::ProgressSink { }; DialogProgress::DialogProgress(wxWindow *parent, wxString const& title_text, wxString const& message) -: wxDialog(parent, -1, title_text, wxDefaultPosition, wxDefaultSize, wxBORDER_RAISED) +: wxDialog(parent, -1, title_text, wxDefaultPosition, wxDefaultSize, (OPT_GET("App/Dark Mode")->GetBool() ? wxBORDER_SIMPLE : wxBORDER_RAISED)) , pulse_timer(GetEventHandler()) { title = new wxStaticText(this, -1, title_text, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE | wxST_NO_AUTORESIZE); diff --git a/src/dialog_style_editor.cpp b/src/dialog_style_editor.cpp index b186e5fd76..f4d266bd5b 100644 --- a/src/dialog_style_editor.cpp +++ b/src/dialog_style_editor.cpp @@ -324,7 +324,7 @@ DialogStyleEditor::DialogStyleEditor(wxWindow *parent, AssStyle *style, agi::Con // Preview auto previewButton = new ColourButton(this, wxSize(45, 16), false, OPT_GET("Colour/Style Editor/Background/Preview")->GetColor()); PreviewText = new wxTextCtrl(this, -1, to_wx(OPT_GET("Tool/Style Editor/Preview Text")->GetString())); - SubsPreview = new SubtitlesPreview(this, wxSize(100, 60), wxSUNKEN_BORDER, OPT_GET("Colour/Style Editor/Background/Preview")->GetColor()); + SubsPreview = new SubtitlesPreview(this, wxSize(100, 60), (OPT_GET("App/Dark Mode")->GetBool() ? wxBORDER_SIMPLE : wxSUNKEN_BORDER), OPT_GET("Colour/Style Editor/Background/Preview")->GetColor()); SubsPreview->SetToolTip(_("Preview of current style")); SubsPreview->SetStyle(*style); diff --git a/src/subs_edit_box.cpp b/src/subs_edit_box.cpp index 9c4bb1f49d..1e8b328493 100644 --- a/src/subs_edit_box.cpp +++ b/src/subs_edit_box.cpp @@ -104,7 +104,7 @@ const auto AssDialogue_Effect = &AssDialogue::Effect; } SubsEditBox::SubsEditBox(wxWindow *parent, agi::Context *context) -: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxRAISED_BORDER, "SubsEditBox") +: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | (OPT_GET("App/Dark Mode")->GetBool() ? wxBORDER_STATIC : wxRAISED_BORDER), "SubsEditBox") , c(context) , retina_helper(agi::make_unique(parent)) , undo_timer(GetEventHandler()) @@ -200,10 +200,10 @@ SubsEditBox::SubsEditBox(wxWindow *parent, agi::Context *context) main_sizer->Add(middle_right_sizer,0,wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM,3); // Text editor - edit_ctrl = new SubsTextEditCtrl(this, wxSize(300,50), wxBORDER_SUNKEN, c); + edit_ctrl = new SubsTextEditCtrl(this, wxSize(300,50), (OPT_GET("App/Dark Mode")->GetBool() ? wxBORDER_SIMPLE : wxBORDER_SUNKEN), c); edit_ctrl->Bind(wxEVT_CHAR_HOOK, &SubsEditBox::OnKeyDown, this); - secondary_editor = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxSize(300,50), wxBORDER_SUNKEN | wxTE_MULTILINE | wxTE_READONLY); + secondary_editor = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxSize(300,50), (OPT_GET("App/Dark Mode")->GetBool() ? wxBORDER_SIMPLE : wxBORDER_SUNKEN) | wxTE_MULTILINE | wxTE_READONLY); main_sizer->Add(secondary_editor,1,wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM,3); main_sizer->Add(edit_ctrl,1,wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM,3); diff --git a/src/toggle_bitmap.cpp b/src/toggle_bitmap.cpp index 71de3ca576..caedeccee2 100644 --- a/src/toggle_bitmap.cpp +++ b/src/toggle_bitmap.cpp @@ -35,6 +35,7 @@ #include "toggle_bitmap.h" #include "command/command.h" +#include "options.h" #include "tooltip_manager.h" #include @@ -42,7 +43,7 @@ #include ToggleBitmap::ToggleBitmap(wxWindow *parent, agi::Context *context, const char *cmd_name, int icon_size, const char *ht_ctx, wxSize const& size) -: wxControl(parent, -1, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER) +: wxControl(parent, -1, wxDefaultPosition, wxDefaultSize, (OPT_GET("App/Dark Mode")->GetBool() ? wxBORDER_SIMPLE : wxSUNKEN_BORDER)) , context(context) , command(*cmd::get(cmd_name)) , img(command.Icon(icon_size))