Skip to content

Commit fb9654b

Browse files
shun2wangJorisGoosen
authored andcommitted
supperss some qml warning in output window
1 parent 297a01b commit fb9654b

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

Desktop/components/JASP/Widgets/CustomMenu.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ FocusScope
183183
{
184184
anchors.fill : parent
185185
acceptedButtons : Qt.NoButton
186-
onWheel : wheel.accepted = true
186+
onWheel : (wheel)=> { wheel.accepted = true; }
187187
}
188188

189189
JASPControl.JASPScrollBar

Desktop/components/JASP/Widgets/FileMenu/FileMenu.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ FocusScope
367367
id: gottaCatchEmAll //Clicks that is
368368
anchors.fill: parent
369369
z: -6
370-
onWheel: function(wheel) { wheel.accepted = true; }
370+
onWheel: (wheel)=>{ wheel.accepted = true; }
371371
}
372372
}
373373
}

Desktop/components/JASP/Widgets/MainPage.qml

+2-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,8 @@ Item
318318
{
319319
resultsJsInterface.resultsLoaded = loadRequest.status === WebEngineView.LoadSucceededStatus;
320320
setTranslatedResultsString();
321-
runJavaScript(`window.sendUrlWhitelist(${JSON.stringify(urlWhitelist)})`); //sent urlWhitelist to js side
321+
if(resultsJsInterface.resultsLoaded)
322+
runJavaScript(`window.sendUrlWhitelist(${JSON.stringify(urlWhitelist)})`); //sent urlWhitelist to js side
322323
}
323324

324325

Desktop/components/JASP/Widgets/RCommanderWindow.qml

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Window
135135
z: -1
136136
acceptedButtons: Qt.NoButton
137137
anchors.fill: parent
138-
onWheel: vertScroll.scrollWheel(wheel)
138+
onWheel: (wheel)=> { vertScroll.scrollWheel(wheel); }
139139
}
140140
}
141141

@@ -170,7 +170,7 @@ Window
170170
z: -1
171171
acceptedButtons: Qt.NoButton
172172
anchors.fill: parent
173-
onWheel: codeEntryScrollbar.scrollWheel(wheel)
173+
onWheel: (wheel)=> { codeEntryScrollbar.scrollWheel(wheel); }
174174
}
175175

176176
Rectangle

QMLComponents/components/JASP/Controls/JASPScrollBar.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Item
147147
anchors.fill: parent;
148148
cursorShape: Qt.PointingHandCursor
149149

150-
onWheel: scrollbar.scrollWheel(wheel)
150+
onWheel: (wheel)=> { scrollbar.scrollWheel(wheel); }
151151

152152
drag
153153
{

0 commit comments

Comments
 (0)