mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 21:06:59 -04:00
Compiled Linux version. The welcome screen doesn't display the icon images, and the buttons don't work. Data is found at *prefix*/Magic Set Editor/data and the images at *prefix*/Magic Set Editor/resource. On Ubuntu, *prefix* is /usr/local/share. Resource files are all the image files from resource. I haven't configured them, because I haven't made it past the welcome screen.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@188 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
|
||||
#include <gui/symbol/point_editor.hpp>
|
||||
#include <gui/symbol/window.hpp>
|
||||
#include <gui/util.hpp>
|
||||
#include <gfx/bezier.hpp>
|
||||
#include <data/action/symbol_part.hpp>
|
||||
#include <util/window_id.hpp>
|
||||
@@ -23,10 +24,10 @@ SymbolPointEditor::SymbolPointEditor(SymbolControl* control, const SymbolPartP&
|
||||
, selection(SELECTED_NONE)
|
||||
, hovering(SELECTED_NONE)
|
||||
// Load gui stock
|
||||
, pointSelect(_("CUR_POINT"), wxBITMAP_TYPE_CUR_RESOURCE)
|
||||
, pointAdd (_("CUR_POINT_ADD"), wxBITMAP_TYPE_CUR_RESOURCE)
|
||||
, pointCurve (_("CUR_POINT_CURVE"),wxBITMAP_TYPE_CUR_RESOURCE)
|
||||
, pointMove (_("CUR_POINT_MOVE"), wxBITMAP_TYPE_CUR_RESOURCE)
|
||||
, pointSelect(load_resource_image(_("CUR_POINT")))
|
||||
, pointAdd (load_resource_image(_("CUR_POINT_ADD")))
|
||||
, pointCurve (load_resource_image(_("CUR_POINT_CURVE")))
|
||||
, pointMove (load_resource_image(_("CUR_POINT_MOVE")))
|
||||
{
|
||||
resetActions();
|
||||
// // fix pen joins
|
||||
@@ -526,6 +527,6 @@ SelectedHandle SymbolPointEditor::findHandle(const Vector2D& pos) {
|
||||
}
|
||||
|
||||
bool SymbolPointEditor::inRange(const Vector2D& a, const Vector2D& b, double range) {
|
||||
return abs(a.x - b.x) <= range &&
|
||||
abs(a.y - b.y) <= range;
|
||||
return fabs(a.x - b.x) <= range &&
|
||||
fabs(a.y - b.y) <= range;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user