mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
Card data in images (start)
* Add uuid implementation * Simplify uid implementation * Check for uid conflicts upon adding/copying cards * Remove unnecessary checks these are already checked as part of the first loop, since they were added to set.cards * Implement card linking * refactor to avoid triple loop * Start link visualization * Continue link visualization * formatting * add missing locale entries * improve layout * improve UI refresh * copy links when copying cards * implement second face editor * refactor using macros * get references * pasting multiple cards and links * start refactoring editors * continue refactoring editors * continue refactoring editors again * finish refactoring editors * refresh card list on link editor event * tweak event handling * Add insert_image script function * change parameter type * add script functions to get cards * add dimensions_of script function calculate both dimensions simultaneously while rendering the image only once. * save value even if not editable * add get_mse_locale script function * Change zoom scale choices * bug fixes * Scale symbol spacing with font size * sync locales * standardize line ending * handle links in new_card * initial waiting on wxWidgets 3.3.1 * update comment * store rect in image filename * store rect in temp file name * Update package.cpp * change line endings
This commit is contained in:
+20
-2
@@ -113,9 +113,14 @@ Style::Style(const FieldP& field)
|
||||
, visible(true)
|
||||
, automatic_side(AUTO_UNKNOWN)
|
||||
, content_dependent(false)
|
||||
{}
|
||||
{
|
||||
field->styleP = this;
|
||||
}
|
||||
|
||||
Style::~Style() {}
|
||||
Style::~Style()
|
||||
{
|
||||
fieldP->styleP = nullptr;
|
||||
}
|
||||
|
||||
IMPLEMENT_REFLECTION(Style) {
|
||||
REFLECT(z_index);
|
||||
@@ -133,6 +138,7 @@ IMPLEMENT_REFLECTION(Style) {
|
||||
|
||||
void init_object(const FieldP& field, StyleP& style) {
|
||||
if (!style) style = field->newStyle();
|
||||
field->styleP = style;
|
||||
}
|
||||
template <> StyleP read_new<Style>(Reader&) {
|
||||
throw InternalError(_("IndexMap contains nullptr StyleP the application should have crashed already"));
|
||||
@@ -262,6 +268,18 @@ void mark_dependency_member(const Style& style, const String& name, const Depend
|
||||
style.markDependencyMember(name,dep);
|
||||
}
|
||||
|
||||
String Style::getRect() {
|
||||
return _("---") +
|
||||
wxString::Format(wxT("%i"), (int)(left)) +
|
||||
_("-") +
|
||||
wxString::Format(wxT("%i"), (int)(top)) +
|
||||
_("-") +
|
||||
wxString::Format(wxT("%i"), (int)(width)) +
|
||||
_("-") +
|
||||
wxString::Format(wxT("%i"), (int)(height)) +
|
||||
_("---");
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------- : StyleListener
|
||||
|
||||
void Style::addListener(StyleListener* listener) {
|
||||
|
||||
Reference in New Issue
Block a user