mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Select the appropriate entry in the zoom dropdown when the zoom is changed externally so that keyboard navigation works. Updates #1433.

Browse source 
Originally committed to SVN as r6379.
This commit is contained in:
Thomas Goyne 2012-01-27 19:23:26 +00:00
parent 2d5df24fd6
commit 0dc0135f9a
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
aegisub/src/video_display.cpp
View file

@ -110,7 +110,7 @@ VideoDisplay::VideoDisplay(
{ {
zoomBox->SetValue(wxString::Format("%g%%", zoomValue * 100.)); zoomBox->SetValue(wxString::Format("%g%%", zoomValue * 100.));
zoomBox->Bind(wxEVT_COMMAND_COMBOBOX_SELECTED, &VideoDisplay::SetZoomFromBox, this); zoomBox->Bind(wxEVT_COMMAND_COMBOBOX_SELECTED, &VideoDisplay::SetZoomFromBox, this);
zoomBox->Bind(wxEVT_COMMAND_TEXT_ENTER, &VideoDisplay::SetZoomFromBox, this); zoomBox->Bind(wxEVT_COMMAND_TEXT_ENTER, &VideoDisplay::SetZoomFromBoxText, this);
con->videoController->Bind(EVT_FRAME_READY, &VideoDisplay::UploadFrameData, this); con->videoController->Bind(EVT_FRAME_READY, &VideoDisplay::UploadFrameData, this);
slots.push_back(con->videoController->AddVideoOpenListener(&VideoDisplay::OnVideoOpen, this)); slots.push_back(con->videoController->AddVideoOpenListener(&VideoDisplay::OnVideoOpen, this));
@ -395,20 +395,29 @@ void VideoDisplay::OnKeyDown(wxKeyEvent &event) {
void VideoDisplay::SetZoom(double value) { void VideoDisplay::SetZoom(double value) {
zoomValue = std::max(value, .125); zoomValue = std::max(value, .125);
zoomBox->SetValue(wxString::Format("%g%%", zoomValue * 100.)); zoomBox->SetSelection(value / .125 - 1);
zoomBox->ChangeValue(wxString::Format("%g%%", zoomValue * 100.));
UpdateSize(true); UpdateSize(true);
} }
void VideoDisplay::SetZoomFromBox(wxCommandEvent &) { void VideoDisplay::SetZoomFromBox(wxCommandEvent &) {
wxString strValue = zoomBox->GetValue(); int sel = zoomBox->GetSelection();
strValue.EndsWith("%", &strValue); if (sel != wxNOT_FOUND) {
double value; zoomValue = (sel + 1) * .125;
if (strValue.ToDouble(&value)) {
zoomValue = value / 100.;
UpdateSize(true); UpdateSize(true);
} }
} }
void VideoDisplay::SetZoomFromBoxText(wxCommandEvent &) {
wxString strValue = zoomBox->GetValue();
if (strValue.EndsWith("%"))
strValue.RemoveLast();
double value;
if (strValue.ToDouble(&value))
SetZoom(value / 100.);
}
void VideoDisplay::SetTool(VisualToolBase *new_tool) { void VideoDisplay::SetTool(VisualToolBase *new_tool) {
toolBar->ClearTools(); toolBar->ClearTools();
toolBar->Realize(); toolBar->Realize();

4
aegisub/src/video_display.h
View file

@ -132,8 +132,10 @@ class VideoDisplay : public wxGLCanvas {
/// @brief Set the size of the display based on the current zoom and video resolution /// @brief Set the size of the display based on the current zoom and video resolution
/// @param force Force the size to be set based on zoom even in detached mode /// @param force Force the size to be set based on zoom even in detached mode
void UpdateSize(bool force = false); void UpdateSize(bool force = false);
/// @brief Set the zoom level to that indicated by the dropdown /// Set the zoom level to that indicated by the dropdown
void SetZoomFromBox(wxCommandEvent&); void SetZoomFromBox(wxCommandEvent&);
/// Set the zoom level to that indicated by the text
void SetZoomFromBoxText(wxCommandEvent&);
/// @brief Key event handler /// @brief Key event handler
void OnKeyDown(wxKeyEvent &event); void OnKeyDown(wxKeyEvent &event);