Skip to content

Fix constructor pixel_snap for all drawables #438

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

Open
oomek wants to merge 1 commit into
base: 4.x.x
Choose a base branch
from
Open

Fix constructor pixel_snap for all drawables #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/fe_image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,6 +1417,12 @@ FeImage::FeImage( FeImage *o, FePresentableParent &p ):

FeImage::~FeImage() {}

void FeImage::refresh_script_geometry()
{
FeBasePresentable::refresh_script_geometry();
scale();
}

const FeBaseTextureContainer *FeImage::get_texture_container() const
{
return m_tex;
Expand Down
1 change: 1 addition & 0 deletions src/fe_image.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ class FeImage : public FeBasePresentable
void transition_swap( FeImage * );
bool fix_masked_image();
FePresentableParent *get_presentable_parent();
void refresh_script_geometry() override;
template <typename T>
void setSize( T w, T h ) { setSize( Vec2f( static_cast<float>( w ), static_cast<float>( h ) ) ); };
void setSize( const Vec2f &s );
Expand Down
2 changes: 1 addition & 1 deletion src/fe_listbox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

const std::string DEFAULT_FORMAT_STRING = "[Title]";

FeListBox::FeListBox( FePresentableParent &p, int x, int y, int w, int h )
FeListBox::FeListBox( FePresentableParent &p, float x, float y, float w, float h )
: FeBasePresentable( p ),
m_selColour( Color::Yellow ),
m_selBg( Color::Blue ),
Expand Down
2 changes: 1 addition & 1 deletion src/fe_listbox.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class FeListBox : public FeBasePresentable
Bounded=3
};
// Constructor for use in scripts. sets m_scripted to true
FeListBox( FePresentableParent &p, int x, int y, int w, int h );
FeListBox( FePresentableParent &p, float x, float y, float w, float h );

// Constructor for use in overlay. sets m_scripted to false
FeListBox( FePresentableParent &p,
Expand Down
4 changes: 2 additions & 2 deletions src/fe_present.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1630,7 +1630,7 @@ FeModel3D *FePresent::add_clone( FeModel3D *o, FePresentableParent &p )
return new_model_3d;
}

FeText *FePresent::add_text( const std::string &n, int x, int y, int w, int h,
FeText *FePresent::add_text( const std::string &n, float x, float y, float w, float h,
FePresentableParent &p )
{
FeText *new_text = new FeText( p, n, x, y, w, h );
Expand All @@ -1649,7 +1649,7 @@ FeText *FePresent::add_text( const std::string &n, int x, int y, int w, int h,
return new_text;
}

FeListBox *FePresent::add_listbox( int x, int y, int w, int h,
FeListBox *FePresent::add_listbox( float x, float y, float w, float h,
FePresentableParent &p )
{
FeListBox *new_lb = new FeListBox( p, x, y, w, h );
Expand Down
4 changes: 2 additions & 2 deletions src/fe_present.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ class FePresent
FeModel3D *add_model_3d(const std::string &n, FePresentableParent &p);
FeImage *add_clone(FeImage *, FePresentableParent &p);
FeModel3D *add_clone(FeModel3D *, FePresentableParent &p);
FeText *add_text(const std::string &n, int x, int y, int w, int h, FePresentableParent &p);
FeListBox *add_listbox(int x, int y, int w, int h, FePresentableParent &p);
FeText *add_text(const std::string &n, float x, float y, float w, float h, FePresentableParent &p);
FeListBox *add_listbox(float x, float y, float w, float h, FePresentableParent &p);
FeRectangle *add_rectangle(float x, float y, float w, float h, FePresentableParent &p);
FeImage *add_surface(float x, float y, float w, float h, int texture_width, int texture_height, FePresentableParent &p);
FeSound *add_sound(const char *n);
Expand Down
4 changes: 2 additions & 2 deletions src/fe_presentable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ FeModel3D *FePresentableParent::add_clone( FeModel3D *m )
return NULL;
}

FeText *FePresentableParent::add_text(const char *t, int x, int y, int w, int h)
FeText *FePresentableParent::add_text(const char *t, float x, float y, float w, float h)
{
FePresent *fep = FePresent::script_get_fep();

Expand All @@ -661,7 +661,7 @@ FeText *FePresentableParent::add_text(const char *t, int x, int y, int w, int h)
return NULL;
}

FeListBox *FePresentableParent::add_listbox(int x, int y, int w, int h)
FeListBox *FePresentableParent::add_listbox(float x, float y, float w, float h)
{
FePresent *fep = FePresent::script_get_fep();

Expand Down
4 changes: 2 additions & 2 deletions src/fe_presentable.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ class FePresentableParent
FeModel3D *add_model_3d(const char *);
FeImage *add_clone(FeImage *);
FeModel3D *add_clone(FeModel3D *);
FeText *add_text(const char *,int, int, int, int);
FeListBox *add_listbox(int, int, int, int);
FeText *add_text(const char *,float, float, float, float);
FeListBox *add_listbox(float, float, float, float);
FeRectangle *add_rectangle(float, float, float, float);
FeImage *add_surface(float, float, float, float);
FeImage *add_surface(float, float, float, float, int, int);
Expand Down
1 change: 1 addition & 0 deletions src/fe_rectangle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ void FeRectangle::refresh_script_geometry()
{
FeBasePresentable::refresh_script_geometry();
m_outline_thickness = m_outline;
scale();
}

float FeRectangle::get_corner_radius() const
Expand Down
2 changes: 1 addition & 1 deletion src/fe_text.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <iostream>

FeText::FeText( FePresentableParent &p, const std::string &str,
int x, int y, int w, int h )
float x, float y, float w, float h )
: FeBasePresentable( p ),
m_string( str ),
m_string_wrapped( str ),
Expand Down
2 changes: 1 addition & 1 deletion src/fe_text.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class FeText : public FeBasePresentable
{
public:
FeText( FePresentableParent &p,
const std::string &str, int x, int y, int w, int h );
const std::string &str, float x, float y, float w, float h );

void setFont( const FeFont & );
Vec2f getPosition() const;
Expand Down
8 changes: 4 additions & 4 deletions src/fe_vm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1665,8 +1665,8 @@ bool FeVM::on_new_layout()

fe.Func( _SC("add_clone"), &FeVM::cb_add_clone_presentable );

fe.Overload<FeText* (*)(const char *, int, int, int, int)>(_SC("add_text"), &FeVM::cb_add_text);
fe.Func<FeListBox* (*)(int, int, int, int)>(_SC("add_listbox"), &FeVM::cb_add_listbox);
fe.Overload<FeText* (*)(const char *, float, float, float, float)>(_SC("add_text"), &FeVM::cb_add_text);
fe.Func<FeListBox* (*)(float, float, float, float)>(_SC("add_listbox"), &FeVM::cb_add_listbox);
fe.Func<FeRectangle* (*)(float, float, float, float)>(_SC("add_rectangle"), &FeVM::cb_add_rectangle);
fe.Overload<FeImage* (*)(float, float, float, float, int, int)>(_SC("add_surface"), &FeVM::cb_add_surface);
fe.Overload<FeImage* (*)(float, float, float, float)>(_SC("add_surface"), &FeVM::cb_add_surface);
Expand Down Expand Up @@ -2935,7 +2935,7 @@ Sqrat::Object FeVM::cb_add_clone_presentable( FeBasePresentable *o )
return ret_obj;
}

FeText* FeVM::cb_add_text(const char *n, int x, int y, int w, int h )
FeText* FeVM::cb_add_text(const char *n, float x, float y, float w, float h )
{
HSQUIRRELVM vm = Sqrat::DefaultVM::Get();
FeVM *fev = (FeVM *)sq_getforeignptr( vm );
Expand All @@ -2951,7 +2951,7 @@ FeText* FeVM::cb_add_text(const char *n, int x, int y, int w, int h )
return ret;
}

FeListBox* FeVM::cb_add_listbox(int x, int y, int w, int h )
FeListBox* FeVM::cb_add_listbox(float x, float y, float w, float h )
{
HSQUIRRELVM vm = Sqrat::DefaultVM::Get();
FeVM *fev = (FeVM *)sq_getforeignptr( vm );
Expand Down
4 changes: 2 additions & 2 deletions src/fe_vm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ class FeVM : public FePresent
static FeImage *cb_add_artwork(const char *);
static FeModel3D *cb_add_model_3d(const char *);
static Sqrat::Object cb_add_clone_presentable( FeBasePresentable * );
static FeText *cb_add_text(const char *,int, int, int, int);
static FeListBox *cb_add_listbox(int, int, int, int);
static FeText *cb_add_text(const char *,float, float, float, float);
static FeListBox *cb_add_listbox(float, float, float, float);
static FeRectangle *cb_add_rectangle(float, float, float, float);
static FeImage *cb_add_surface(float, float, float, float);
static FeImage *cb_add_surface(float, float, float, float, int, int);
Expand Down