Compare commits

..

1 Commits

Author SHA1 Message Date
janrupf
b09f3448f9 NOISSUE Try on fixing overflowing text 2019-06-22 00:27:43 +02:00
4 changed files with 9 additions and 13 deletions

View File

@@ -321,7 +321,7 @@ QString DirNameFromString(QString string, QString inDir)
}
else
{
dirName = baseName + QString::number(num);
dirName = baseName + QString::number(num);;
}
// If it's over 9000

View File

@@ -805,18 +805,12 @@ QString InstanceList::getStagedInstancePath()
bool InstanceList::commitStagedInstance(const QString& path, const QString& instanceName, const QString& groupName)
{
QDir dir;
QString instID = FS::DirNameFromString(instanceName, m_instDir);
QString instanceDirName = instID;
if(instanceDirName.length() > 180)
{
instanceDirName.truncate(176);
instanceDirName += instID.at(instID.length() - 4); // In case the last 4 chars were changed
// to prevent double folder names
}
{
WatchLock lock(m_watcher, m_instDir);
QString destination = FS::PathCombine(m_instDir, instanceDirName);
if(!QDir().rename(path, destination))
QString destination = FS::PathCombine(m_instDir, instID);
if(!dir.rename(path, destination))
{
qWarning() << "Failed to move" << path << "to" << destination;
return false;

View File

@@ -661,6 +661,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
// Create the instance list widget
{
view = new GroupView(ui->centralWidget);
view->setTextElideMode(Qt::TextElideMode::ElideRight);
view->setSelectionMode(QAbstractItemView::SingleSelection);
// FIXME: leaks ListViewDelegate

View File

@@ -34,7 +34,6 @@ static void viewItemTextLayout(QTextLayout &textLayout, int lineWidth, qreal &he
height = 0;
widthUsed = 0;
textLayout.beginLayout();
QString str = textLayout.text();
while (true)
{
QTextLine line = textLayout.createLine();
@@ -190,11 +189,13 @@ void ListViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
QStyle *style = opt.widget ? opt.widget->style() : QApplication::style();
// FIXME: Things go really weird with long instance names
// const int iconSize = style->pixelMetric(QStyle::PM_IconViewIconSize);
const int iconSize = 48;
QRect iconbox = opt.rect;
const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, opt.widget) + 1;
const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin, nullptr, opt.widget) + 1;
QRect textRect = opt.rect;
textRect.setWidth(qMin(textRect.width(), iconbox.width()));
QRect textHighlightRect = textRect;
// clip the decoration on top, remove width padding
textRect.adjust(textMargin, iconSize + textMargin + 5, -textMargin, 0);
@@ -299,7 +300,7 @@ void ListViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
const int lineCount = textLayout.lineCount();
const QRect layoutRect = QStyle::alignedRect(
opt.direction, opt.displayAlignment, QSize(textRect.width(), int(height)), textRect);
opt.direction, opt.displayAlignment, QSize(textRect.width(), int(height)), textRect);
const QPointF position = layoutRect.topLeft();
for (int i = 0; i < lineCount; ++i)
{