mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-20 16:20:52 +01:00
@@ -46,7 +46,7 @@ DynamicElementTextItem::DynamicElementTextItem(Element *parent_element) :
|
|||||||
QSettings settings;
|
QSettings settings;
|
||||||
setRotation(settings.value("dynamic_text_rotation", 0).toInt());
|
setRotation(settings.value("dynamic_text_rotation", 0).toInt());
|
||||||
setKeepVisualRotation(true);
|
setKeepVisualRotation(true);
|
||||||
setTextWidth(settings.value("dynamic_text_widht", -1).toInt());
|
setTextWidth(settings.value("dynamic_text_width", -1).toInt());
|
||||||
connect(this, &DynamicElementTextItem::textEdited, [this](const QString &old_str, const QString &new_str)
|
connect(this, &DynamicElementTextItem::textEdited, [this](const QString &old_str, const QString &new_str)
|
||||||
{
|
{
|
||||||
if(this->m_parent_element && this->m_parent_element->diagram())
|
if(this->m_parent_element && this->m_parent_element->diagram())
|
||||||
|
|||||||
@@ -403,10 +403,10 @@ QWidget *ElementPropertiesWidget::generalWidget()
|
|||||||
//Set the maximum size of the pixmap to the minimum size of the layout
|
//Set the maximum size of the pixmap to the minimum size of the layout
|
||||||
QPixmap pixmap = m_element->pixmap();
|
QPixmap pixmap = m_element->pixmap();
|
||||||
int margin = vlayout_->contentsMargins().left() + vlayout_->contentsMargins().right();
|
int margin = vlayout_->contentsMargins().left() + vlayout_->contentsMargins().right();
|
||||||
int widht_ = vlayout_->minimumSize().width()-margin;
|
int width_ = vlayout_->minimumSize().width()-margin;
|
||||||
|
|
||||||
if (pixmap.size().width() > widht_ || pixmap.size().height() > widht_) {
|
if (pixmap.size().width() > width_ || pixmap.size().height() > width_) {
|
||||||
pix->setPixmap(m_element->pixmap().scaled (widht_, widht_, Qt::KeepAspectRatio, Qt::SmoothTransformation));
|
pix->setPixmap(m_element->pixmap().scaled (width_, width_, Qt::KeepAspectRatio, Qt::SmoothTransformation));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
pix->setPixmap(pixmap);
|
pix->setPixmap(pixmap);
|
||||||
|
|||||||
Reference in New Issue
Block a user