iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Use the native placeholder text functionality on OS X

This commit is contained in:
Thomas Goyne 2012-10-10 08:53:15 -07:00
parent 7ca2c5cb65
commit daf28e2005
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
aegisub/src/osx_utils.mm
View File

@ -24,6 +24,7 @@
#include "config.h" #include "config.h"
#include <wx/window.h> #include <wx/window.h>
#include <wx/osx/core/cfstring.h>
#import <AppKit/AppKit.h> #import <AppKit/AppKit.h>
@ -54,3 +55,11 @@ void SetFloatOnParent(wxWindow *window) {
queue:nil queue:nil
usingBlock:^(NSNotification *) { [nsWindow setLevel:NSFloatingWindowLevel]; }]; usingBlock:^(NSNotification *) { [nsWindow setLevel:NSFloatingWindowLevel]; }];
} }
void SetPlaceholderText(wxWindow *window, wxString const& placeholder) {
id nsWindow = window->GetHandle();
if ([nsWindow respondsToSelector:@selector(cell)]) {
NSTextFieldCell *cell = [nsWindow cell];
cell.placeholderString = wxCFStringRef(placeholder).AsNSString();
}
}

11
aegisub/src/placeholder_ctrl.h
View File

@ -42,6 +42,7 @@ class Placeholder : public BaseCtrl {
BaseCtrl::Create(parent, -1, placeholder, wxDefaultPosition, size, style); BaseCtrl::Create(parent, -1, placeholder, wxDefaultPosition, size, style);
} }
#ifndef __WXOSX__
/// Focus gained event handler /// Focus gained event handler
void OnSetFocus(wxFocusEvent& evt) { void OnSetFocus(wxFocusEvent& evt) {
evt.Skip(); evt.Skip();
@ -104,6 +105,16 @@ public:
return ""; return "";
return BaseCtrl::GetValue(); return BaseCtrl::GetValue();
} }
#else
public:
Placeholder(wxWindow *parent, wxString const& placeholder, wxSize const& size, long style, wxString const& tooltip)
: placeholder(placeholder)
{
Create(parent, size, style);
BaseCtrl::SetToolTip(tooltip);
SetPlaceholderText(this, placeholder);
}
#endif
}; };
template<> inline void Placeholder<wxComboBox>::Create(wxWindow *parent, wxSize const& size, long style) { template<> inline void Placeholder<wxComboBox>::Create(wxWindow *parent, wxSize const& size, long style) {

4
aegisub/src/subs_edit_box.cpp
View File

@ -316,10 +316,6 @@ void SubsEditBox::PopulateActorList() {
if (AssDialogue *diag = dynamic_cast<AssDialogue*>(*it)) if (AssDialogue *diag = dynamic_cast<AssDialogue*>(*it))
actors.insert(diag->Actor); actors.insert(diag->Actor);
} }
#ifdef __APPLE__
// OSX doesn't like combo boxes that are empty.
actors.insert("Actor");
#endif
actors.erase(""); actors.erase("");
wxArrayString arrstr; wxArrayString arrstr;
arrstr.reserve(actors.size()); arrstr.reserve(actors.size());

2
aegisub/src/utils.h
View File

@ -99,6 +99,8 @@ void AddFullScreenButton(wxWindow *window);
void SetFloatOnParent(wxWindow *window); void SetFloatOnParent(wxWindow *window);
void SetPlaceholderText(wxWindow *window, wxString const& placeholder);
/// Forward a mouse wheel event to the window under the mouse if needed /// Forward a mouse wheel event to the window under the mouse if needed
/// @param source The initial target of the wheel event /// @param source The initial target of the wheel event
/// @param evt The event /// @param evt The event