Merge pull request #472 from aws-lumberyard-dev/LY-110648

Ly 110648 - Asset Processor - Source path will become truncated when selected if the current folder name is not completely displayed.
This commit is contained in:
jjjoness
2021-05-03 18:37:02 +01:00
committed by GitHub
4 changed files with 62 additions and 1 deletions
@@ -31,7 +31,9 @@ set(FILES
native/ui/GoToButton.h
native/ui/GoToButton.cpp
native/ui/GoToButton.ui
native/ui/MainWindow.h
native/ui/JobTreeViewItemDelegate.h
native/ui/JobTreeViewItemDelegate.cpp
native/ui/MainWindow.ui
native/ui/MainWindow.cpp
native/ui/MainWindow.ui
native/ui/ProductAssetDetailsPanel.h
@@ -0,0 +1,25 @@
/*
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
* its licensors.
*
* For complete copyright and license terms please see the LICENSE at the root of this
* distribution (the "License"). All use of this software is governed by the License,
* or, if provided, by the license below or the license accompanying this file. Do not
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
*
*/
#include "JobTreeViewItemDelegate.h"
namespace AssetProcessor
{
void JobTreeViewItemDelegate::initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const
{
AzQtComponents::TableViewItemDelegate::initStyleOption(option, index);
option->features &= ~(QStyleOptionViewItem::WrapText);
}
}
#include <native/ui/moc_JobTreeViewItemDelegate.cpp>
@@ -0,0 +1,32 @@
/*
* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
* its licensors.
*
* For complete copyright and license terms please see the LICENSE at the root of this
* distribution (the "License"). All use of this software is governed by the License,
* or, if provided, by the license below or the license accompanying this file. Do not
* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
*
*/
#pragma once
#if !defined(Q_MOC_RUN)
#include <AzQtComponents/Components/Widgets/TableView.h>
#endif
namespace AssetProcessor
{
class JobTreeViewItemDelegate
: public AzQtComponents::TableViewItemDelegate
{
Q_OBJECT
public:
using AzQtComponents::TableViewItemDelegate::TableViewItemDelegate;
protected:
void initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const override;
};
} // namespace AssetProcessor
@@ -32,6 +32,7 @@
#include <native/resourcecompiler/JobsModel.h>
#include "native/ui/ui_MainWindow.h"
#include "native/ui/JobTreeViewItemDelegate.h"
#include "../utilities/GUIApplicationManager.h"
@@ -221,6 +222,7 @@ void MainWindow::Activate()
ui->jobTreeView->setModel(m_jobSortFilterProxy);
ui->jobTreeView->setSortingEnabled(true);
ui->jobTreeView->header()->setDefaultAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
ui->jobTreeView->setItemDelegate(new AssetProcessor::JobTreeViewItemDelegate(ui->jobTreeView));
ui->jobTreeView->setToolTip(tr("Click to view Job Log"));