Marko Pintera 13 лет назад
Родитель
Сommit
4dbf2902aa
2 измененных файлов с 7 добавлено и 7 удалено
  1. 0 1
      CamelotEditor/Include/CmQtEditor.h
  2. 7 6
      CamelotEditor/Source/CmQtEditor.cpp

+ 0 - 1
CamelotEditor/Include/CmQtEditor.h

@@ -23,7 +23,6 @@ namespace CamelotEditor
 
 	private:
 		QMenuBar* mMenuBar;
-		QToolBar* mMainToolBar;
 		QWidget* mCentralWidget;
 		QStatusBar* mStatusBar;
 		QtDockOverlayWidget* mDockOverlayWidget;

+ 7 - 6
CamelotEditor/Source/CmQtEditor.cpp

@@ -7,6 +7,7 @@
 #include <QtCore/QLocale>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QHBoxLayout>
 #include <QtGui/QMoveEvent>
 #include <QtGui/QResizeEvent>
 #include <boost/bind.hpp>
@@ -31,6 +32,7 @@ namespace CamelotEditor
 
 		if(desc.maximized)
 		{
+			setGeometry(desc.left, desc.top, desc.width, desc.height);
 			setWindowState(Qt::WindowMaximized);
 		}
 		else
@@ -41,22 +43,21 @@ namespace CamelotEditor
 		mMenuBar = new QMenuBar(this);
 		setMenuBar(mMenuBar);
 
-		mMainToolBar = new QToolBar(this);
-		addToolBar(mMainToolBar);
-
 		mCentralWidget = new QWidget(this);
 		setCentralWidget(mCentralWidget);
 
+		mDockOverlayWidget = new QtDockOverlayWidget(this);
+
 		mStatusBar = new QStatusBar(this);
 		setStatusBar(mStatusBar);
+
+		setContextMenuPolicy(Qt::NoContextMenu);
 		
 		addMenuItemCallback("File", "Open project", boost::bind(&QtEditor::openProject, this));
 		addMenuItemCallback("File", "Save project", boost::bind(&QtEditor::saveProject, this));
 		addMenuItemSeparator("File");
 		addMenuItemCallback("File", "Exit", boost::bind(&QtEditor::exitEditor, this));
 
-		mDockOverlayWidget = new QtDockOverlayWidget(this);
-
 		retranslateUi();
 		setObjectNames();
 
@@ -71,7 +72,6 @@ namespace CamelotEditor
 	void QtEditor::setObjectNames()
 	{
 		mMenuBar->setObjectName(QStringLiteral("MenuBar"));
-		mMainToolBar->setObjectName(QStringLiteral("MainToolBar"));
 		mCentralWidget->setObjectName(QStringLiteral("CentralWidget"));
 		mStatusBar->setObjectName(QStringLiteral("StatusBar"));
 		mDockOverlayWidget->setObjectName(QStringLiteral("DockOverlayWidget"));
@@ -157,6 +157,7 @@ namespace CamelotEditor
 
 		gEditorPrefs().setMainWindowLayout(desc);
 
+		mDockOverlayWidget->resize(event->size());
 		QWidget::resizeEvent(event);
 	}