1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-13 21:40:11 +00:00

fixed scene toolbar layout problems

This commit is contained in:
Marc Zinnschlag 2014-04-03 13:00:19 +02:00
parent 5b5069535e
commit 5d422fec8a
5 changed files with 13 additions and 2 deletions

View File

@ -6,6 +6,7 @@
CSVWorld::SceneTool::SceneTool (SceneToolbar *parent) : QPushButton (parent)
{
setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
setIconSize (QSize (parent->getIconSize(), parent->getIconSize()));
setFixedSize (parent->getButtonSize(), parent->getButtonSize());
connect (this, SIGNAL (clicked()), this, SLOT (openRequest()));

View File

@ -6,7 +6,7 @@
#include "scenetool.hpp"
CSVWorld::SceneToolbar::SceneToolbar (int buttonSize, QWidget *parent)
: QWidget (parent), mButtonSize (buttonSize)
: QWidget (parent), mButtonSize (buttonSize), mIconSize (buttonSize-8)
{
setFixedWidth (mButtonSize);
@ -27,3 +27,8 @@ int CSVWorld::SceneToolbar::getButtonSize() const
{
return mButtonSize;
}
int CSVWorld::SceneToolbar::getIconSize() const
{
return mIconSize;
}

View File

@ -15,6 +15,7 @@ namespace CSVWorld
QVBoxLayout *mLayout;
int mButtonSize;
int mIconSize;
public:
@ -23,6 +24,8 @@ namespace CSVWorld
void addTool (SceneTool *tool);
int getButtonSize() const;
int getIconSize() const;
};
}

View File

@ -8,7 +8,7 @@
#include "scenetoolbar.hpp"
CSVWorld::SceneToolMode::SceneToolMode (SceneToolbar *parent)
: SceneTool (parent), mButtonSize (parent->getButtonSize())
: SceneTool (parent), mButtonSize (parent->getButtonSize()), mIconSize (parent->getIconSize())
{
mPanel = new QFrame (this, Qt::Popup);
@ -29,6 +29,7 @@ void CSVWorld::SceneToolMode::addButton (const std::string& icon, const std::str
{
QPushButton *button = new QPushButton (QIcon (QPixmap (icon.c_str())), "", mPanel);
button->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
button->setIconSize (QSize (mIconSize, mIconSize));
button->setFixedSize (mButtonSize, mButtonSize);
mLayout->addWidget (button);

View File

@ -20,6 +20,7 @@ namespace CSVWorld
QHBoxLayout *mLayout;
std::map<QPushButton *, std::string> mButtons; // widget, id
int mButtonSize;
int mIconSize;
public: