Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 16:14:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4853 from huffman/remove-scripts-tip

Browse source 
Remove scripts 'Tip' label and fix tool window heights
This commit is contained in:
Philip Rosedale 2015-05-13 11:21:49 -07:00
commit 96b761357b
3 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/ui/RunningScriptsWidget.cpp
View file

@ -162,8 +162,7 @@ void RunningScriptsWidget::showEvent(QShowEvent* event) {
QRect parentGeometry = Application::getInstance()->getDesirableApplicationGeometry(); QRect parentGeometry = Application::getInstance()->getDesirableApplicationGeometry();
int titleBarHeight = UIUtil::getWindowTitleBarHeight(this); int titleBarHeight = UIUtil::getWindowTitleBarHeight(this);
int menuBarHeight = Menu::getInstance()->geometry().height(); int topMargin = titleBarHeight;
int topMargin = titleBarHeight + menuBarHeight;
setGeometry(parentGeometry.topLeft().x(), parentGeometry.topLeft().y() + topMargin, setGeometry(parentGeometry.topLeft().x(), parentGeometry.topLeft().y() + topMargin,
size().width(), parentWidget()->height() - topMargin); size().width(), parentWidget()->height() - topMargin);

3
interface/src/ui/ToolWindow.cpp
View file

@ -38,8 +38,7 @@ bool ToolWindow::event(QEvent* event) {
QRect mainGeometry = mainWindow->geometry(); QRect mainGeometry = mainWindow->geometry();
int titleBarHeight = UIUtil::getWindowTitleBarHeight(this); int titleBarHeight = UIUtil::getWindowTitleBarHeight(this);
int menuBarHeight = Menu::getInstance()->geometry().height(); int topMargin = titleBarHeight;
int topMargin = titleBarHeight + menuBarHeight;
_lastGeometry = QRect(mainGeometry.topLeft().x(), mainGeometry.topLeft().y() + topMargin, _lastGeometry = QRect(mainGeometry.topLeft().x(), mainGeometry.topLeft().y() + topMargin,
DEFAULT_WIDTH, mainGeometry.height() - topMargin); DEFAULT_WIDTH, mainGeometry.height() - topMargin);

16
interface/ui/runningScriptsWidget.ui
View file

@ -349,22 +349,6 @@ font: bold 16pt;
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="tipLabel">
<property name="font">
<font>
<family>Helvetica,Arial,sans-serif</family>
<pointsize>14</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: #5f5f5f; margin: 2px;</string>
</property>
<property name="text">
<string>Tip</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>