Skip to content

WIP: Adapt controls to Hi-DPI #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
0tkl wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

WIP: Adapt controls to Hi-DPI #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e06959
Use wxSizerFlags almost everywhere
0tkl Jan 5, 2026
480de3b
6px to Border() and 12px to DoubleBorder()
0tkl Jan 5, 2026
72a4e83
grid sizer gaps
0tkl Jan 5, 2026
62e1702
wxDefaultSize
0tkl Jan 5, 2026
64d4c89
HiDPI support batch 1
0tkl Jan 5, 2026
4293864
HiDPI support batch 2
0tkl Jan 5, 2026
1b2df46
Grid Hi-DPI
0tkl Jan 5, 2026
d997b65
better proportion for DialogJumpTo
0tkl Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ass_exporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ void AssExporter::DrawSettings(wxWindow *parent, wxSizer *target_sizer) {
auto box = new wxStaticBoxSizer(wxVERTICAL, parent, to_wx(filter.GetName()));
wxWindow *window = filter.GetConfigDialogWindow(box->GetStaticBox(), c);
if (window) {
box->Add(window, 0, wxEXPAND, 0);
target_sizer->Add(box, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
box->Add(window, wxSizerFlags().Expand());
target_sizer->Add(box, wxSizerFlags().Expand().Border(wxALL & ~wxTOP));
target_sizer->Show(box, false);
Sizers[filter.GetName()] = box;
}
Expand Down
22 changes: 11 additions & 11 deletions src/audio_box.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,34 +82,34 @@ AudioBox::AudioBox(wxWindow *parent, agi::Context *context)

// VertVol sider
wxSizer *VertVol = new wxBoxSizer(wxHORIZONTAL);
VertVol->Add(VerticalZoom,1,wxEXPAND,0);
VertVol->Add(VolumeBar,1,wxEXPAND,0);
VertVol->Add(VerticalZoom, wxSizerFlags(1).Expand());
VertVol->Add(VolumeBar, wxSizerFlags(1).Expand());
wxSizer *VertVolArea = new wxBoxSizer(wxVERTICAL);
VertVolArea->Add(VertVol,1,wxEXPAND,0);
VertVolArea->Add(VertVol, wxSizerFlags(1).Expand());

auto link_btn = new ToggleBitmap(panel, context, "audio/opt/vertical_link", 16, "Audio", FromDIP(wxSize(20, -1)));
link_btn->SetMaxSize(wxDefaultSize);
VertVolArea->Add(link_btn, 0, wxRIGHT | wxEXPAND, 0);
VertVolArea->Add(link_btn, wxSizerFlags().Expand());
OPT_SUB("Audio/Link", &AudioBox::OnVerticalLink, this);

// Top sizer
wxSizer *TopSizer = new wxBoxSizer(wxHORIZONTAL);
TopSizer->Add(audioDisplay,1,wxEXPAND,0);
TopSizer->Add(HorizontalZoom,0,wxEXPAND,0);
TopSizer->Add(VertVolArea,0,wxEXPAND,0);
TopSizer->Add(audioDisplay, wxSizerFlags(1).Expand());
TopSizer->Add(HorizontalZoom, wxSizerFlags().Expand());
TopSizer->Add(VertVolArea, wxSizerFlags().Expand());

context->karaoke = new AudioKaraoke(panel, context);

// Main sizer
auto MainSizer = new wxBoxSizer(wxVERTICAL);
MainSizer->Add(TopSizer,1,wxEXPAND|wxALL,3);
MainSizer->Add(toolbar::GetToolbar(panel, "audio", context, "Audio"),0,wxEXPAND|wxLEFT|wxRIGHT,3);
MainSizer->Add(context->karaoke,0,wxEXPAND|wxALL,3);
MainSizer->Add(TopSizer, wxSizerFlags(1).Expand().Border(wxALL, 3));
MainSizer->Add(toolbar::GetToolbar(panel, "audio", context, "Audio"), wxSizerFlags().Expand().Border(wxLEFT | wxRIGHT, 3));
MainSizer->Add(context->karaoke, wxSizerFlags().Expand().Border(wxALL, 3));
MainSizer->Show(context->karaoke, false);
panel->SetSizer(MainSizer);

wxSizer *audioSashSizer = new wxBoxSizer(wxHORIZONTAL);
audioSashSizer->Add(panel, 1, wxEXPAND);
audioSashSizer->Add(panel, wxSizerFlags(1).Expand());
SetSizerAndFit(audioSashSizer);
SetMinSize(wxSize(-1, OPT_GET("Audio/Display Height")->GetInt()));
SetMinimumSizeY(panel->GetSize().GetHeight());
Expand Down
2 changes: 1 addition & 1 deletion src/audio_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ AudioDisplay::AudioDisplay(wxWindow *parent, AudioController *controller, agi::C
audio_renderer->SetAmplitudeScale(scale_amplitude);
SetZoomLevel(0);

SetMinClientSize(wxSize(-1, 70));
SetMinClientSize(FromDIP(wxSize(-1, 70)));
SetBackgroundStyle(wxBG_STYLE_PAINT);
SetThemeEnabled(false);

Expand Down
2 changes: 1 addition & 1 deletion src/auto4_base.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ namespace Automation4 {
w.Create(bsr->GetParentWindow(), -1, to_wx(bsr->GetTitle()));
auto s = new wxBoxSizer(wxHORIZONTAL); // sizer for putting contents in
wxWindow *ww = config_dialog->CreateWindow(&w); // generate actual dialog contents
s->Add(ww, 0, wxALL, 5); // add contents to dialog
s->Add(ww, wxSizerFlags().Border()); // add contents to dialog
w.SetSizerAndFit(s);
w.SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED);
w.CenterOnParent();
Expand Down
4 changes: 2 additions & 2 deletions src/auto4_lua_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ namespace Automation4 {
// Same serialisation interface as single-line edit
wxControl *Create(wxWindow *parent) override {
cw = new wxTextCtrl(parent, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE, StringBinder(&text));
cw->SetMinSize(wxSize(0, 30));
cw->SetMinSize(parent->FromDIP(wxSize(0, 30)));
cw->SetToolTip(to_wx(hint));
return cw;
}
Expand Down Expand Up @@ -505,7 +505,7 @@ namespace Automation4 {
}

auto ms = new wxBoxSizer(wxVERTICAL);
ms->Add(s, 0, wxBOTTOM, 5);
ms->Add(s, wxSizerFlags().Border(wxBOTTOM));
ms->Add(bs);
window->SetSizerAndFit(ms);

Expand Down
10 changes: 5 additions & 5 deletions src/base_grid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ BaseGrid::BaseGrid(wxWindow* parent, agi::Context *context)

auto scrollbarpositioner = new wxBoxSizer(wxHORIZONTAL);
scrollbarpositioner->AddStretchSpacer();
scrollbarpositioner->Add(scrollBar, 0, wxEXPAND, 0);
scrollbarpositioner->Add(scrollBar, wxSizerFlags().Expand());

SetSizerAndFit(scrollbarpositioner);

Expand Down Expand Up @@ -181,7 +181,7 @@ void BaseGrid::UpdateStyle() {
dc.SetFont(font);

// Set line height
lineHeight = dc.GetCharHeight() + 4;
lineHeight = dc.GetCharHeight() + FromDIP(4);

// Set row brushes
row_colors.Default.SetColour(to_wx(OPT_GET("Colour/Subtitle Grid/Background/Background")->GetColor()));
Expand Down Expand Up @@ -319,13 +319,13 @@ void BaseGrid::OnPaint(wxPaintEvent &) {
dc.SetPen(*wxTRANSPARENT_PEN);

auto paint_text = [&](wxString const& str, int x, int y, int col) {
int left = x + 4;
int left = x + FromDIP(4);
if (columns[col]->Centered()) {
wxSize ext = dc.GetTextExtent(str);
left += (columns[col]->Width() - 6 - ext.GetWidth()) / 2;
left += (columns[col]->Width() - FromDIP(6) - ext.GetWidth()) / 2;
}

dc.DrawText(str, left, y + 2);
dc.DrawText(str, left, y + FromDIP(2));
};

// Paint header
Expand Down
10 changes: 5 additions & 5 deletions src/dialog_about.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,11 @@ void ShowAboutDialog(wxWindow *parent) {
wxTextCtrl *textctrl = new wxTextCtrl(&d, -1, aboutString, wxDefaultPosition, wxSize(-1, 200), wxTE_MULTILINE | wxTE_READONLY | wxBORDER_NONE);

wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);
MainSizer->Add(new wxStaticBitmap(&d, -1, GETIMAGE(splash)), 0, wxCENTER, 0);
MainSizer->Add(new wxStaticLine(&d, wxID_ANY), 0, wxEXPAND | wxALL, 0);
MainSizer->Add(textctrl, 0, wxEXPAND | wxALL, 0);
MainSizer->Add(new wxStaticLine(&d, wxID_ANY), 0, wxEXPAND | wxALL, 0);
MainSizer->Add(d.CreateButtonSizer(wxOK), 0, wxEXPAND | wxALL, 6);
MainSizer->Add(new wxStaticBitmap(&d, -1, GETIMAGE(splash)), wxSizerFlags().Center());
MainSizer->Add(new wxStaticLine(&d, wxID_ANY), wxSizerFlags().Expand());
MainSizer->Add(textctrl, wxSizerFlags().Expand());
MainSizer->Add(new wxStaticLine(&d, wxID_ANY), wxSizerFlags().Expand());
MainSizer->Add(d.CreateButtonSizer(wxOK), wxSizerFlags().Expand().Border());

d.SetSizerAndFit(MainSizer);
d.CentreOnParent();
Expand Down
12 changes: 6 additions & 6 deletions src/dialog_attachments.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ DialogAttachments::DialogAttachments(wxWindow *parent, AssFile *ass)
buttonSizer->Add(attachGraphics, 1);
buttonSizer->Add(extractButton, 1);
buttonSizer->Add(deleteButton, 1);
buttonSizer->Add(new HelpButton(&d, "Attachment Manager"), 1, wxLEFT, 5);
buttonSizer->Add(new HelpButton(&d, "Attachment Manager"), wxSizerFlags(1).Border(wxLEFT));
buttonSizer->Add(new wxButton(&d, wxID_CANCEL, _("&Close")), 1);

auto mainSizer = new wxBoxSizer(wxVERTICAL);
mainSizer->Add(listView, 1, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, 5);
mainSizer->Add(buttonSizer, 0, wxALL | wxEXPAND, 5);
mainSizer->Add(listView, wxSizerFlags(1).Expand().Border(wxALL & ~wxBOTTOM));
mainSizer->Add(buttonSizer, wxSizerFlags().Expand().Border());
d.SetSizerAndFit(mainSizer);
d.CenterOnParent();

Expand All @@ -107,9 +107,9 @@ DialogAttachments::DialogAttachments(wxWindow *parent, AssFile *ass)
void DialogAttachments::UpdateList() {
listView->ClearAll();

listView->InsertColumn(0, _("Attachment name"), wxLIST_FORMAT_LEFT, 280);
listView->InsertColumn(1, _("Size"), wxLIST_FORMAT_LEFT, 100);
listView->InsertColumn(2, _("Group"), wxLIST_FORMAT_LEFT, 100);
listView->InsertColumn(0, _("Attachment name"), wxLIST_FORMAT_LEFT, d.FromDIP(280));
listView->InsertColumn(1, _("Size"), wxLIST_FORMAT_LEFT, d.FromDIP(100));
listView->InsertColumn(2, _("Group"), wxLIST_FORMAT_LEFT, d.FromDIP(100));

for (auto& attach : ass->Attachments) {
int row = listView->GetItemCount();
Expand Down
31 changes: 16 additions & 15 deletions src/dialog_automation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,11 @@ DialogAutomation::DialogAutomation(agi::Context *c)
, global_manager(config::global_scripts)
, global_scripts_changed(global_manager->AddScriptChangeListener(&DialogAutomation::RebuildList, this))
{
int gap = wxSizerFlags::GetDefaultBorder();
SetIcons(GETICONS(automation_toolbutton));

// create main controls
list = new wxListView(this, -1, wxDefaultPosition, wxSize(600, 175), wxLC_REPORT|wxLC_SINGLE_SEL);
list = new wxListView(this, -1, wxDefaultPosition, FromDIP(wxSize(600, 175)), wxLC_REPORT|wxLC_SINGLE_SEL);
wxButton *add_button = new wxButton(this, -1, _("&Add"));
remove_button = new wxButton(this, -1, _("&Remove"));
reload_button = new wxButton(this, -1, _("Re&load"));
Expand All @@ -130,24 +131,24 @@ DialogAutomation::DialogAutomation(agi::Context *c)
reload_autoload_button->Bind(wxEVT_BUTTON, &DialogAutomation::OnReloadAutoload, this);

// add headers to list view
list->InsertColumn(0, "", wxLIST_FORMAT_CENTER, 20);
list->InsertColumn(1, _("Name"), wxLIST_FORMAT_LEFT, 140);
list->InsertColumn(2, _("Filename"), wxLIST_FORMAT_LEFT, 90);
list->InsertColumn(3, _("Description"), wxLIST_FORMAT_LEFT, 330);
list->InsertColumn(0, "", wxLIST_FORMAT_CENTER, FromDIP(20));
list->InsertColumn(1, _("Name"), wxLIST_FORMAT_LEFT, FromDIP(140));
list->InsertColumn(2, _("Filename"), wxLIST_FORMAT_LEFT, FromDIP(90));
list->InsertColumn(3, _("Description"), wxLIST_FORMAT_LEFT, FromDIP(330));

// button layout
wxSizer *button_box = new wxBoxSizer(wxHORIZONTAL);
button_box->AddStretchSpacer(2);
button_box->Add(add_button, 0);
button_box->Add(remove_button, 0);
button_box->AddSpacer(10);
button_box->Add(reload_button, 0);
button_box->Add(info_button, 0);
button_box->AddSpacer(10);
button_box->Add(reload_autoload_button, 0);
button_box->AddSpacer(10);
button_box->Add(new HelpButton(this,"Automation Manager"), 0);
button_box->Add(close_button, 0);
button_box->Add(add_button);
button_box->Add(remove_button);
button_box->AddSpacer(2 * gap);
button_box->Add(reload_button);
button_box->Add(info_button);
button_box->AddSpacer(2 * gap);
button_box->Add(reload_autoload_button);
button_box->AddSpacer(2 * gap);
button_box->Add(new HelpButton(this,"Automation Manager"));
button_box->Add(close_button);
button_box->AddStretchSpacer(2);

// main layout
Expand Down
50 changes: 26 additions & 24 deletions src/dialog_colorpicker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,13 +597,14 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, agi::Color initial_color,

// Arrange the controls in a nice way
wxSizer *spectop_sizer = new wxBoxSizer(wxHORIZONTAL);
spectop_sizer->Add(new wxStaticText(spectrum_box, -1, _("Spectrum mode:")), 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT, 5);
spectop_sizer->Add(colorspace_choice, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT);
spectop_sizer->Add(5, 5, 1, wxEXPAND);
spectop_sizer->Add(preview_box, 0, wxALIGN_CENTER_VERTICAL);

wxSizer *spectrum_sizer = new wxFlexGridSizer(3, 5, 5);
spectrum_sizer->Add(spectop_sizer, wxEXPAND);
spectop_sizer->Add(new wxStaticText(spectrum_box, -1, _("Spectrum mode:")), wxSizerFlags().CenterVertical().Left().Border(wxRIGHT));
spectop_sizer->Add(colorspace_choice, wxSizerFlags().CenterVertical().Left());
int gap = wxSizerFlags::GetDefaultBorder();
spectop_sizer->Add(gap, gap, wxSizerFlags(1).Expand());
spectop_sizer->Add(preview_box, wxSizerFlags().CenterVertical());

wxSizer *spectrum_sizer = new wxFlexGridSizer(3, gap, gap);
spectrum_sizer->Add(spectop_sizer, wxSizerFlags().Expand());
spectrum_sizer->AddStretchSpacer(1);
spectrum_sizer->AddStretchSpacer(1);
spectrum_sizer->Add(spectrum);
Expand All @@ -612,51 +613,51 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, agi::Color initial_color,
if (!alpha)
spectrum_sizer->Hide(alpha_slider);

spectrum_box_sizer->Add(spectrum_sizer, 0, wxALL, 3);
spectrum_box_sizer->Add(spectrum_sizer, wxSizerFlags().Border(wxALL, 3));

wxString rgb_labels[] = { _("Red:"), _("Green:"), _("Blue:") };
rgb_box_sizer->Add(MakeColorInputSizer(rgb_box, rgb_labels, rgb_input), 1, wxALL|wxEXPAND, 3);
rgb_box_sizer->Add(MakeColorInputSizer(rgb_box, rgb_labels, rgb_input), wxSizerFlags(1).Expand().Border(wxALL, 3));

wxString ass_labels[] = { "ASS:", "HTML:", _("Alpha:") };
wxControl *ass_ctrls[] = { ass_input, html_input, alpha_input };
auto ass_colors_sizer = MakeColorInputSizer(rgb_box, ass_labels, ass_ctrls);
if (!alpha)
ass_colors_sizer->Hide(alpha_input);
rgb_box_sizer->Add(ass_colors_sizer, 0, wxALL|wxCENTER|wxEXPAND, 3);
rgb_box_sizer->Add(ass_colors_sizer, wxSizerFlags().Expand().Border(wxALL, 3));

wxString hsl_labels[] = { _("Hue:"), _("Sat.:"), _("Lum.:") };
hsl_box_sizer->Add(MakeColorInputSizer(hsl_box, hsl_labels, hsl_input), 0, wxALL|wxEXPAND, 3);
hsl_box_sizer->Add(MakeColorInputSizer(hsl_box, hsl_labels, hsl_input), wxSizerFlags().Expand().Border(wxALL, 3));

wxString hsv_labels[] = { _("Hue:"), _("Sat.:"), _("Value:") };
hsv_box_sizer->Add(MakeColorInputSizer(hsv_box, hsv_labels, hsv_input), 0, wxALL|wxEXPAND, 3);
hsv_box_sizer->Add(MakeColorInputSizer(hsv_box, hsv_labels, hsv_input), wxSizerFlags().Expand().Border(wxALL, 3));

wxSizer *hsx_sizer = new wxBoxSizer(wxHORIZONTAL);
hsx_sizer->Add(hsl_box_sizer);
hsx_sizer->AddSpacer(5);
hsx_sizer->AddSpacer(gap);
hsx_sizer->Add(hsv_box_sizer);

wxSizer *picker_sizer = new wxBoxSizer(wxHORIZONTAL);
picker_sizer->AddStretchSpacer();
picker_sizer->Add(screen_dropper_icon, 0, wxALIGN_CENTER|wxRIGHT, 5);
picker_sizer->Add(screen_dropper, 0, wxALIGN_CENTER);
picker_sizer->Add(screen_dropper_icon, wxSizerFlags().Center().Border(wxRIGHT));
picker_sizer->Add(screen_dropper, wxSizerFlags().Center());
picker_sizer->AddStretchSpacer();
picker_sizer->Add(recent_box, 0, wxALIGN_CENTER);
picker_sizer->Add(recent_box, wxSizerFlags().Center());
picker_sizer->AddStretchSpacer();

wxStdDialogButtonSizer *button_sizer = CreateStdDialogButtonSizer(wxOK | wxCANCEL | wxHELP);

wxSizer *input_sizer = new wxBoxSizer(wxVERTICAL);
input_sizer->Add(rgb_box_sizer, 0, wxEXPAND);
input_sizer->AddSpacer(5);
input_sizer->Add(hsx_sizer, 0, wxEXPAND);
input_sizer->Add(rgb_box_sizer, wxSizerFlags().Expand());
input_sizer->AddSpacer(gap);
input_sizer->Add(hsx_sizer, wxSizerFlags().Expand());
input_sizer->AddStretchSpacer(1);
input_sizer->Add(picker_sizer, 0, wxEXPAND);
input_sizer->Add(picker_sizer, wxSizerFlags().Expand());
input_sizer->AddStretchSpacer(2);
input_sizer->Add(button_sizer, 0, wxALIGN_RIGHT);
input_sizer->Add(button_sizer, wxSizerFlags().Right());

wxSizer *main_sizer = new wxBoxSizer(wxHORIZONTAL);
main_sizer->Add(spectrum_box_sizer, 1, wxALL | wxEXPAND, 5);
main_sizer->Add(input_sizer, 0, (wxALL&~wxLEFT)|wxEXPAND, 5);
main_sizer->Add(spectrum_box_sizer, wxSizerFlags(1).Expand().Border());
main_sizer->Add(input_sizer, wxSizerFlags().Expand().Border(wxALL & ~wxLEFT));

SetSizerAndFit(main_sizer);

Expand Down Expand Up @@ -704,7 +705,8 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, agi::Color initial_color,

template<int N, class Control>
wxSizer *DialogColorPicker::MakeColorInputSizer(wxWindow *parent, wxString (&labels)[N], Control *(&inputs)[N]) {
auto sizer = new wxFlexGridSizer(2, 5, 5);
int gap = wxSizerFlags::GetDefaultBorder();
auto sizer = new wxFlexGridSizer(2, gap, gap);
for (int i = 0; i < N; ++i) {
sizer->Add(new wxStaticText(parent, -1, labels[i]), wxSizerFlags(1).Center().Left());
sizer->Add(inputs[i], wxSizerFlags().Expand());
Expand Down
10 changes: 5 additions & 5 deletions src/dialog_detached_video.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#include <wx/display.h> /// Must be included last.

DialogDetachedVideo::DialogDetachedVideo(agi::Context *context)
: wxDialog(context->parent, -1, "Detached Video", wxDefaultPosition, wxSize(400,300), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX | wxWANTS_CHARS)
: wxDialog(context->parent, -1, "Detached Video", wxDefaultPosition, FromDIP(wxSize(400,300)), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX | wxWANTS_CHARS)
, context(context)
, old_display(context->videoDisplay)
, old_slider(context->videoSlider)
Expand All @@ -71,13 +71,13 @@ DialogDetachedVideo::DialogDetachedVideo(agi::Context *context)

// Set sizer
wxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
mainSizer->Add(videoBox,1,wxEXPAND);
mainSizer->Add(videoBox, wxSizerFlags(1).Expand());
SetSizerAndFit(mainSizer);

// Ensure we can grow smaller, without these the window is locked to at least the initial size
context->videoDisplay->SetMinSize(wxSize(1,1));
videoBox->SetMinSize(wxSize(1,1));
SetMinSize(wxSize(1,1));
context->videoDisplay->SetMinSize(wxSize(1, 1));
videoBox->SetMinSize(wxSize(1, 1));
SetMinSize(wxSize(1, 1));

persist = std::make_unique<PersistLocation>(this, "Video/Detached");

Expand Down
5 changes: 3 additions & 2 deletions src/dialog_dummy_video.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,12 @@ DialogDummyVideo::DialogDummyVideo(wxWindow *parent)
res_sizer->Add(spin_ctrl(&d, 1, 10000, &height), wxSizerFlags(1).Expand());

auto color_sizer = new wxBoxSizer(wxHORIZONTAL);
auto color_btn = new ColourButton(&d, wxSize(30, 17), false, color);
auto color_btn = new ColourButton(&d, d.FromDIP(wxSize(30, 17)), false, color);
color_sizer->Add(color_btn, wxSizerFlags().DoubleBorder(wxRIGHT));
color_sizer->Add(new wxCheckBox(&d, -1, _("Checkerboard &pattern"), wxDefaultPosition, wxDefaultSize, 0, wxGenericValidator(&pattern)), wxSizerFlags(1).Center());

sizer = new wxFlexGridSizer(2, 5, 5);
int gap = wxSizerFlags::GetDefaultBorder();
sizer = new wxFlexGridSizer(2, gap, gap);
AddCtrl(_("Video resolution:"), resolution_shortcuts(&d, width, height));
AddCtrl("", res_sizer);
AddCtrl(_("Color:"), color_sizer);
Expand Down
Loading
Loading