Skip to content

Commit

Permalink
multiple PQSettings.hotEdgeWidth by 2 everywhere for a slightly large…
Browse files Browse the repository at this point in the history
…r hot edge
  • Loading branch information
luspi committed Jun 14, 2021
1 parent 6fcc3f3 commit e9aa8e4
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion qml/mainwindow/PQLabels.qml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Rectangle {

id: labels_top

x: variables.metaDataWidthWhenKeptOpen + (PQSettings.hotEdgeWidth+10)
x: variables.metaDataWidthWhenKeptOpen + (2*PQSettings.hotEdgeWidth+10)
Behavior on x { NumberAnimation { duration: PQSettings.animationDuration*100 } }
y: PQSettings.thumbnailPosition=="Bottom" ? 10 : parent.height-height-10

Expand Down
4 changes: 2 additions & 2 deletions qml/mainwindow/PQThumbnailBar.qml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ Item {
PQSettings.thumbnailPosition=="Top" ?

((PQSettings.thumbnailKeepVisible ||
(variables.mousePos.y < PQSettings.hotEdgeWidth*5 && !visible) ||
(variables.mousePos.y < 2*PQSettings.hotEdgeWidth*5 && !visible) ||
(variables.mousePos.y < height && visible) ||
(PQSettings.thumbnailKeepVisibleWhenNotZoomedIn && variables.currentPaintedZoomLevel<=1) ||
forceShow)&&!forceHide ? 0 : -height) :

((PQSettings.thumbnailKeepVisible ||
(variables.mousePos.y > toplevel.height-PQSettings.hotEdgeWidth*5 && !visible) ||
(variables.mousePos.y > toplevel.height-2*PQSettings.hotEdgeWidth*5 && !visible) ||
(variables.mousePos.y > toplevel.height-height && visible) ||
(PQSettings.thumbnailKeepVisibleWhenNotZoomedIn && variables.currentPaintedZoomLevel<=1) ||
forceShow)&&!forceHide ? (toplevel.height-height-(variables.videoControlsVisible ? 50 : 0)) : toplevel.height)
Expand Down
2 changes: 1 addition & 1 deletion qml/menumeta/PQMainMenu.qml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Rectangle {
return
if(mainmenu_top.visible && !resizePressed && variables.mousePos.x < toplevel.width-width-5)
mainmenu_top.opacity = 0
else if(!mainmenu_top.visible && !variables.slideShowActive && !variables.faceTaggingActive && variables.mousePos.x > toplevel.width-(PQSettings.hotEdgeWidth+5))
else if(!mainmenu_top.visible && !variables.slideShowActive && !variables.faceTaggingActive && variables.mousePos.x > toplevel.width-(2*PQSettings.hotEdgeWidth+5))
mainmenu_top.opacity = 1
}
onSlideShowActiveChanged: {
Expand Down
2 changes: 1 addition & 1 deletion qml/menumeta/PQMetaData.qml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Rectangle {
return
if(metadata_top.visible && !resizePressed && variables.mousePos.x > width+5)
metadata_top.opacity = 0
else if(!metadata_top.visible && variables.mousePos.x < (PQSettings.hotEdgeWidth+5) && PQSettings.metadataEnableHotEdge && !variables.faceTaggingActive)
else if(!metadata_top.visible && variables.mousePos.x < (2*PQSettings.hotEdgeWidth+5) && PQSettings.metadataEnableHotEdge && !variables.faceTaggingActive)
metadata_top.opacity = 1
}
}
Expand Down
2 changes: 1 addition & 1 deletion qml/slideshow/PQSlideShowControls.qml
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ Rectangle {
return
if(controls_top.visible && variables.mousePos.y > controls_top.height+5)
controls_top.opacity = 0
else if(!controls_top.visible && variables.mousePos.y < (PQSettings.hotEdgeWidth+5))
else if(!controls_top.visible && variables.mousePos.y < (2*PQSettings.hotEdgeWidth+5))
controls_top.opacity = 1
}
}
Expand Down

0 comments on commit e9aa8e4

Please sign in to comment.