diff options
| author | jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-22 20:52:28 +0000 |
|---|---|---|
| committer | jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> | 2012-02-22 20:52:28 +0000 |
| commit | 84b7f5f577515aa57554db59d2156dee7fb7c18b (patch) | |
| tree | f0e27be46ad85be256ce36831392f6f78fbee301 /scribus/propertiespalette.cpp | |
| parent | 00dd398049ea9ff4a696e6330e6b45fc1271aea0 (diff) | |
| download | scribus-84b7f5f577515aa57554db59d2156dee7fb7c18b.tar.gz scribus-84b7f5f577515aa57554db59d2156dee7fb7c18b.tar.xz scribus-84b7f5f577515aa57554db59d2156dee7fb7c18b.zip | |
#10593: Scribus freezes up on column width adjust.
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17323 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus/propertiespalette.cpp')
| -rw-r--r-- | scribus/propertiespalette.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/scribus/propertiespalette.cpp b/scribus/propertiespalette.cpp index 8c53fe6..681352e 100644 --- a/scribus/propertiespalette.cpp +++ b/scribus/propertiespalette.cpp @@ -2090,13 +2090,15 @@ void PropertiesPalette::SetCurItem(PageItem *i) if (colgapLabel->currentIndex() == 0) { dGap->setMaximum(qMax((i2->width() / i2->Cols - i2->textToFrameDistLeft() - i2->textToFrameDistRight())*m_unitRatio, 0.0)); - dGap->setValue(i2->ColGap*m_unitRatio); + dGap->setValue(i2->ColGap * m_unitRatio); } else { dGap->setMaximum(qMax((i2->width() / i2->Cols)*m_unitRatio, 0.0)); - dGap->setValue(i2->columnWidth()*m_unitRatio); + dGap->setValue(i2->columnWidth() * m_unitRatio); } + colgapLabel->setEnabled(DCol->value() > 1); + dGap->setEnabled(DCol->value() > 1); DLeft->setValue(i2->textToFrameDistLeft()*m_unitRatio); DTop->setValue(i2->textToFrameDistTop()*m_unitRatio); DBottom->setValue(i2->textToFrameDistBottom()*m_unitRatio); @@ -2926,17 +2928,19 @@ void PropertiesPalette::setCols(int r, double g) if (colgapLabel->currentIndex() == 0) { dGap->setMaximum(qMax((i2->width() / i2->Cols - i2->textToFrameDistLeft() - i2->textToFrameDistRight())*m_unitRatio, 0.0)); - dGap->setValue(i2->ColGap*m_unitRatio); + dGap->setValue(i2->ColGap * m_unitRatio); } else { - dGap->setMaximum(qMax((i2->width() / i2->Cols)*m_unitRatio, 0.0)); - dGap->setValue(i2->columnWidth()*m_unitRatio); + dGap->setMaximum(qMax((i2->width() / i2->Cols) *m_unitRatio, 0.0)); + dGap->setValue(i2->columnWidth() * m_unitRatio); } } } DCol->setMinimum(1); dGap->setMinimum(0); + colgapLabel->setEnabled(DCol->value() > 1); + dGap->setEnabled(DCol->value() > 1); HaveItem = tmp; } @@ -3925,7 +3929,7 @@ void PropertiesPalette::NewGap() return; if (colgapLabel->currentIndex() == 0) CurItem->ColGap = dGap->value() / m_unitRatio; - else + else if (CurItem->Cols > 1) { double lineCorr; if (CurItem->lineColor() != CommonStrings::None) |