feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
This commit is contained in:
Eike Ziller
2012-12-18 17:42:04 +01:00
parent aa0dc33d32 4510d1ef84
commit 03717cf7ef
37 changed files with 372 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qmlprofiler/qml/RangeDetails.qml
View File

@@ -51,7 +51,10 @@ Item {
y: 25
property int yoffset: root.scrollY
onYoffsetChanged: y = relativey + yoffset
onYoffsetChanged: {
y = relativey + yoffset
fitInView();
}
property int relativey : y - yoffset
onYChanged: relativey = y - yoffset
@@ -71,10 +74,10 @@ Item {
x = root.width - width;
if (x < 0)
x = 0;
if (y + height > root.candidateHeight)
y = root.candidateHeight - height;
if (y < 0)
y = 0;
if (y - yoffset + height > root.candidateHeight)
y = root.candidateHeight - height + yoffset;
if (y < yoffset)
y = yoffset;
}
// shadow
@@ -187,8 +190,8 @@ Item {
drag.target: parent
drag.minimumX: 0
drag.maximumX: root.width - parent.width
drag.minimumY: 0
drag.maximumY: root.candidateHeight - parent.height
drag.minimumY: yoffset
drag.maximumY: root.candidateHeight - parent.height + yoffset
onClicked: {
root.gotoSourceLocation(file, line, column);
root.recenterOnItem(view.selectedItem);

17
src/plugins/qmlprofiler/qml/SelectionRangeDetails.qml
View File

@@ -46,7 +46,10 @@ Item {
y: 125
property int yoffset: root.scrollY
onYoffsetChanged: y = relativey + yoffset
onYoffsetChanged: {
y = relativey + yoffset
fitInView();
}
property int relativey : y - yoffset
onYChanged: relativey = y - yoffset
@@ -66,10 +69,10 @@ Item {
x = root.width - width;
if (x < 0)
x = 0;
if (y + height > root.candidateHeight)
y = root.candidateHeight - height;
if (y < 0)
y = 0;
if (y + height - yoffset > root.candidateHeight)
y = root.candidateHeight - height + yoffset;
if (y < yoffset)
y = yoffset;
}
// shadow
@@ -158,8 +161,8 @@ Item {
drag.target: parent
drag.minimumX: 0
drag.maximumX: root.width - parent.width
drag.minimumY: 0
drag.maximumY: root.candidateHeight - parent.height
drag.minimumY: yoffset
drag.maximumY: root.candidateHeight - parent.height + yoffset
onClicked: {
if ((selectionRange.x < flick.contentX) ^ (selectionRange.x+selectionRange.width > flick.contentX + flick.width)) {
root.recenter(selectionRange.startTime + selectionRange.duration/2);