ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: Use window decorations on dialog windows (issue #376)

Browse Source 
* added SubWindow flag to QtWindow to either use window decorations or show window within main window
* fixes black borders in some Linux window managers

bug id = 376

fortune cookie message = Your skill will accomplish what the force of many others cannot.
This commit is contained in:
Eberhard Graether
2017-06-07 14:40:16 +02:00
parent fb5bb33a10
commit 503ca76a40
27 changed files with 167 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/view/QtBookmarkView.cpp
+8 -6
View File
@@ -9,6 +9,8 @@
#include "qt/view/QtViewWidgetWrapper.h"
#include "qt/window/QtBookmarkCreator.h"
#include "qt/window/QtBookmarkBrowser.h"
#include "qt/view/QtMainView.h"
#include "qt/window/QtMainWindow.h"
#include "utility/messaging/type/MessageDeleteBookmarkForActiveTokens.h"
#include "utility/messaging/type/MessageDisplayBookmarks.h"
@@ -176,10 +178,10 @@ void QtBookmarkView::displayBookmarks(const std::vector<std::shared_ptr<Bookmark
[=]()
{
if (m_bookmarkBrowser == nullptr)
{
m_bookmarkBrowser = new QtBookmarkBrowser();
m_bookmarkBrowser->setupBookmarkBrowser();
}
{
m_bookmarkBrowser = new QtBookmarkBrowser(dynamic_cast<QtMainView*>(dynamic_cast<View*>(getViewLayout())->getViewLayout())->getMainWindow());
m_bookmarkBrowser->setupBookmarkBrowser();
}
m_bookmarkBrowser->setBookmarks(bookmarks);
m_bookmarkBrowser->show();
@@ -193,7 +195,7 @@ void QtBookmarkView::displayBookmarkCreator(const std::vector<std::string>& name
m_onQtThread(
[=]()
{
QtBookmarkCreator* bookmarkCreator = new QtBookmarkCreator();
QtBookmarkCreator* bookmarkCreator = new QtBookmarkCreator(dynamic_cast<QtMainView*>(dynamic_cast<View*>(getViewLayout())->getViewLayout())->getMainWindow());
bookmarkCreator->setupBookmarkCreator();
std::string displayName = "";
@@ -223,7 +225,7 @@ void QtBookmarkView::displayBookmarkEditor(std::shared_ptr<Bookmark> bookmark, c
m_onQtThread(
[=]()
{
QtBookmarkCreator* bookmarkCreator = new QtBookmarkCreator(nullptr, true, bookmark->getId());
QtBookmarkCreator* bookmarkCreator = new QtBookmarkCreator(dynamic_cast<QtMainView*>(dynamic_cast<View*>(getViewLayout())->getViewLayout())->getMainWindow(), true, bookmark->getId());
bookmarkCreator->setupBookmarkCreator();
bookmarkCreator->setDisplayName(bookmark->getName());
bookmarkCreator->setComment(bookmark->getComment());
src/lib_gui/qt/view/QtDialogView.cpp
+1 -1
View File
@@ -330,7 +330,7 @@ template<typename T>
void QtDialogView::setUIBlocked(bool blocked)
{
m_mainWindow->setEnabled(!blocked);
m_mainWindow->setContentEnabled(!blocked);
if (blocked)
{