teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

fixed scene toolbar layout problems

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/opencs/view/world/scenetool.cpp
View file

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

7
apps/opencs/view/world/scenetoolbar.cpp
View file

@ -6,7 +6,7 @@
#include "scenetool.hpp" #include "scenetool.hpp"
CSVWorld::SceneToolbar::SceneToolbar (int buttonSize, QWidget *parent) CSVWorld::SceneToolbar::SceneToolbar (int buttonSize, QWidget *parent)
: QWidget (parent), mButtonSize (buttonSize) : QWidget (parent), mButtonSize (buttonSize), mIconSize (buttonSize-8)
{ {
setFixedWidth (mButtonSize); setFixedWidth (mButtonSize);
@ -26,4 +26,9 @@ void CSVWorld::SceneToolbar::addTool (SceneTool *tool)
int CSVWorld::SceneToolbar::getButtonSize() const int CSVWorld::SceneToolbar::getButtonSize() const
{ {
return mButtonSize; return mButtonSize;
}
int CSVWorld::SceneToolbar::getIconSize() const
{
return mIconSize;
} }

3
apps/opencs/view/world/scenetoolbar.hpp
View file

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

3
apps/opencs/view/world/scenetoolmode.cpp
View file

@ -8,7 +8,7 @@
#include "scenetoolbar.hpp" #include "scenetoolbar.hpp"
CSVWorld::SceneToolMode::SceneToolMode (SceneToolbar *parent) CSVWorld::SceneToolMode::SceneToolMode (SceneToolbar *parent)
: SceneTool (parent), mButtonSize (parent->getButtonSize()) : SceneTool (parent), mButtonSize (parent->getButtonSize()), mIconSize (parent->getIconSize())
{ {
mPanel = new QFrame (this, Qt::Popup); 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); QPushButton *button = new QPushButton (QIcon (QPixmap (icon.c_str())), "", mPanel);
button->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed)); button->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
button->setIconSize (QSize (mIconSize, mIconSize));
button->setFixedSize (mButtonSize, mButtonSize); button->setFixedSize (mButtonSize, mButtonSize);
mLayout->addWidget (button); mLayout->addWidget (button);

1
apps/opencs/view/world/scenetoolmode.hpp
View file

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