mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Implement min, max and step for floatedit in lua dialogs

Browse source 
Originally committed to SVN as r6524.
This commit is contained in:
Thomas Goyne 2012-02-28 01:23:24 +00:00
parent 27144a7ef7
commit b9fc28b44d
1 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
aegisub/src/auto4_lua_dialog.cpp
View file

@ -42,7 +42,7 @@
#include "auto4_lua.h" #include "auto4_lua.h"
#ifndef AGI_PRE #ifndef AGI_PRE
#include <assert.h> #include <cassert>
#include <wx/button.h> #include <wx/button.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
@ -53,9 +53,12 @@
#include <wx/spinctrl.h> #include <wx/spinctrl.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <wx/validate.h> #include <wx/validate.h>
#include <wx/valnum.h>
#include <wx/window.h> #include <wx/window.h>
#endif #endif
#include <cfloat>
#include <libaegisub/log.h> #include <libaegisub/log.h>
#include "ass_style.h" #include "ass_style.h"
@ -82,13 +85,13 @@ namespace {
inline void get_if_right_type(lua_State *L, double &def) inline void get_if_right_type(lua_State *L, double &def)
{ {
if (lua_isnumber(L, -1)) if (lua_isnumber(L, -1))
def = std::max(lua_tonumber(L, -1), def); def = lua_tonumber(L, -1);
} }
inline void get_if_right_type(lua_State *L, int &def) inline void get_if_right_type(lua_State *L, int &def)
{ {
if (lua_isnumber(L, -1)) if (lua_isnumber(L, -1))
def = std::max<int>(lua_tointeger(L, -1), def); def = lua_tointeger(L, -1);
} }
inline void get_if_right_type(lua_State *L, bool &def) inline void get_if_right_type(lua_State *L, bool &def)
@ -329,14 +332,25 @@ namespace Automation4 {
// Float only edit // Float only edit
class FloatEdit : public Edit { class FloatEdit : public Edit {
public:
double value; double value;
double min;
double max;
double step;
wxSpinCtrlDouble *scd;
public:
FloatEdit(lua_State *L) FloatEdit(lua_State *L)
: Edit(L) : Edit(L)
, value(get_field(L, "value", 0.0)) , value(get_field(L, "value", 0.0))
, min(get_field(L, "min", -DBL_MAX))
, max(get_field(L, "max", DBL_MAX))
, step(get_field(L, "step", 0.0))
, scd(0)
{ {
// TODO: spin button support if (min >= max) {
max = DBL_MAX;
min = -DBL_MAX;
}
} }
bool CanSerialiseValue() const { return true; } bool CanSerialiseValue() const { return true; }
@ -355,15 +369,30 @@ namespace Automation4 {
wxControl *Create(wxWindow *parent) wxControl *Create(wxWindow *parent)
{ {
cw = new wxTextCtrl(parent, -1, SerialiseValue()); if (step > 0) {
scd = new wxSpinCtrlDouble(parent, -1,
wxString::Format("%g", value), wxDefaultPosition,
wxDefaultSize, wxSP_ARROW_KEYS, min, max, value, step);
scd->SetToolTip(hint);
return scd;
}
wxFloatingPointValidator<double> val(4, &value, wxNUM_VAL_NO_TRAILING_ZEROES);
val.SetRange(min, max);
cw = new wxTextCtrl(parent, -1, SerialiseValue(), wxDefaultPosition, wxDefaultSize, 0, val);
cw->SetToolTip(hint); cw->SetToolTip(hint);
return cw; return cw;
} }
void ControlReadBack() void ControlReadBack()
{ {
text = cw->GetValue(); if (scd)
UnserialiseValue(text); value = scd->GetValue();
else
cw->TransferDataFromWindow();
text = SerialiseValue();
} }
void LuaReadBack(lua_State *L) void LuaReadBack(lua_State *L)
@ -575,7 +604,7 @@ namespace Automation4 {
LOG_D("automation/lua/dialog") << "reading back button_pushed"; LOG_D("automation/lua/dialog") << "reading back button_pushed";
int btn = button_pushed; int btn = button_pushed;
if (btn == 0) { if (btn == 0) {
LOG_D("automation/lua/dialog") << "was zero, cancelled"; LOG_D("automation/lua/dialog") << "was zero, canceled";
// Always cancel/closed // Always cancel/closed
lua_pushboolean(L, 0); lua_pushboolean(L, 0);
} else if (buttons.size() == 0 && btn == 1) { } else if (buttons.size() == 0 && btn == 1) {