Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
7b7d9ea7
Commit
7b7d9ea7
authored
Jul 28, 2010
by
Lasse Holmstedt
Browse files
QML Observer: Fixed issues with resizing and changed splitter to widget
parent
bb10beb1
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/tools/qml/qmlobserver/qmlruntime.cpp
View file @
7b7d9ea7
...
...
@@ -65,7 +65,6 @@
#include
<private/qabstractanimation_p.h>
#include
<private/qdeclarativeengine_p.h>
#include
<QSplitter>
#include
<QSettings>
#include
<QXmlStreamReader>
#include
<QBuffer>
...
...
@@ -550,8 +549,8 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
,
m_scriptOptions
(
0
)
,
tester
(
0
)
,
useQmlFileBrowser
(
true
)
,
m_centralWidget
(
0
)
,
translator
(
0
)
,
m_splitter
(
0
)
{
QDeclarativeViewer
::
registerTypes
();
setWindowTitle
(
tr
(
"Qt QML Viewer"
));
...
...
@@ -588,17 +587,14 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
canvas
=
new
QmlViewer
::
QDeclarativeDesignView
(
this
);
addToolBar
(
Qt
::
TopToolBarArea
,
canvas
->
toolbar
());
m_splitter
=
new
QSplitter
(
this
);
m_splitter
->
setOrientation
(
Qt
::
Vertical
);
m_splitter
->
addWidget
(
canvas
->
crumblePathWidget
());
m_centralWidget
=
new
QWidget
(
this
);
QVBoxLayout
*
layout
=
new
QVBoxLayout
(
m_centralWidget
);
layout
->
setMargin
(
0
);
layout
->
setSpacing
(
0
);
layout
->
addWidget
(
canvas
->
crumblePathWidget
());
layout
->
addWidget
(
canvas
);
canvas
->
crumblePathWidget
()
->
setSizePolicy
(
QSizePolicy
::
Expanding
,
QSizePolicy
::
Minimum
);
m_splitter
->
addWidget
(
canvas
);
m_splitter
->
setHandleWidth
(
1
);
m_splitter
->
setStretchFactor
(
0
,
0
);
m_splitter
->
setStretchFactor
(
0
,
1000
);
m_splitter
->
setCollapsible
(
0
,
false
);
m_splitter
->
setCollapsible
(
1
,
false
);
m_splitter
->
setSizePolicy
(
QSizePolicy
::
Expanding
,
QSizePolicy
::
Expanding
);
m_centralWidget
->
setSizePolicy
(
QSizePolicy
::
MinimumExpanding
,
QSizePolicy
::
MinimumExpanding
);
//canvas->setSizePolicy(Qt:);
canvas
->
setAttribute
(
Qt
::
WA_OpaquePaintEvent
);
...
...
@@ -621,7 +617,7 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
setMenuBar
(
0
);
}
setCentralWidget
(
m_
splitter
);
setCentralWidget
(
m_
centralWidget
);
namFactory
=
new
NetworkAccessManagerFactory
;
canvas
->
engine
()
->
setNetworkAccessManagerFactory
(
namFactory
);
...
...
@@ -1422,11 +1418,11 @@ void QDeclarativeViewer::updateSizeHints(bool initial)
QSize
newWindowSize
=
initial
?
initialSize
:
canvas
->
sizeHint
();
//qWarning() << "USH:" << (initial ? "INIT:" : "V2R:") << "setting fixed size " << newWindowSize;
if
(
!
isFullScreen
()
&&
!
isMaximized
())
{
m_centralWidget
->
setFixedSize
(
newWindowSize
.
width
(),
newWindowSize
.
height
()
+
32
);
canvas
->
setFixedSize
(
newWindowSize
);
resize
(
1
,
1
);
layout
()
->
setSizeConstraint
(
QLayout
::
SetFixedSize
);
layout
()
->
activate
();
}
}
//qWarning() << "USH: R2V: setting free size ";
...
...
@@ -1437,6 +1433,9 @@ void QDeclarativeViewer::updateSizeHints(bool initial)
canvas
->
setMinimumSize
(
QSize
(
0
,
0
));
canvas
->
setMaximumSize
(
QSize
(
QWIDGETSIZE_MAX
,
QWIDGETSIZE_MAX
));
m_centralWidget
->
setMinimumSize
(
QSize
(
0
,
0
));
m_centralWidget
->
setMaximumSize
(
QSize
(
QWIDGETSIZE_MAX
,
QWIDGETSIZE_MAX
));
isRecursive
=
false
;
}
...
...
src/tools/qml/qmlobserver/qmlruntime.h
View file @
7b7d9ea7
...
...
@@ -201,7 +201,7 @@ private:
bool
useQmlFileBrowser
;
Q
Splitter
*
m_splitter
;
Q
Widget
*
m_centralWidget
;
QTranslator
*
translator
;
void
loadTranslationFile
(
const
QString
&
directory
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment