ralsina/xrandroll
1
0
Fork 0
mirror of https://github.com/ralsina/xrandroll.git synced 2024-11-23 11:32:22 +00:00
Code Issues Projects Releases Wiki Activity

Fix snapping for right/bottom edges

Browse Source
This commit is contained in:
Roberto Alsina 2022-06-08 13:31:41 -03:00
parent 0fef2428b4
commit 0bc8df5c61
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.md
View File

@ -1,4 +1,4 @@
* Parse refresh rate for modes and use it [DONE] * Parse refresh rate for modes and use it [DONE]
* Test using older xrandr * Test using older xrandr
* Fix snapping (only works for one of the monitors?) * Fix snapping (only works for one of the monitors?) [DONE]
* Normalize positions so they always start from 0:0 * Normalize positions so they always start from 0:0

1
xrandroll/main.py
View File

@ -255,7 +255,6 @@ class Window(QObject):
snaps_x.append(monitor.pos_x + mod_x) snaps_x.append(monitor.pos_x + mod_x)
snaps_y.append(monitor.pos_y) snaps_y.append(monitor.pos_y)
snaps_y.append(monitor.pos_y + mod_y) snaps_y.append(monitor.pos_y + mod_y)
print(snaps_x, snaps_y)
return snaps_x, snaps_y return snaps_x, snaps_y
def adjust_view(self): def adjust_view(self):

15
xrandroll/monitor_item.py
View File

@ -77,8 +77,8 @@ class MonitorItem(QGraphicsRectItem, QObject):
new_pos = view.mapFromScene(self.orig_pos) + current_pos - click_pos new_pos = view.mapFromScene(self.orig_pos) + current_pos - click_pos
new_pos = view.mapToScene(new_pos) new_pos = view.mapToScene(new_pos)
delta = abs(view.mapToScene(0, 25).y()) delta = abs(view.mapToScene(0, 25).y())
if not event.modifiers() & Qt.ControlModifier: if not event.modifiers() & Qt.ControlModifier: # Ctrl was not pressed, so snap
# Check for snaps # This snaps the left and top edges
x = new_pos.x() x = new_pos.x()
delta_x = min((abs(x - sx), i) for i, sx in enumerate(snaps_x)) delta_x = min((abs(x - sx), i) for i, sx in enumerate(snaps_x))
if delta_x[0] < delta: # snap if delta_x[0] < delta: # snap
@ -87,5 +87,16 @@ class MonitorItem(QGraphicsRectItem, QObject):
delta_y = min((abs(y - sy), i) for i, sy in enumerate(snaps_y)) delta_y = min((abs(y - sy), i) for i, sy in enumerate(snaps_y))
if delta_y[0] < delta: # snap if delta_y[0] < delta: # snap
new_pos.setY(int(snaps_y[delta_y[1]])) new_pos.setY(int(snaps_y[delta_y[1]]))
# This snaps the right and bottom edges
x = new_pos.x() + self.rect().width()
delta_x = min((abs(x - sx), i) for i, sx in enumerate(snaps_x))
if delta_x[0] < delta: # snap
new_pos.setX(int(snaps_x[delta_x[1]]) - self.rect().width())
y = new_pos.y() + self.rect().height()
delta_y = min((abs(y - sy), i) for i, sy in enumerate(snaps_y))
if delta_y[0] < delta: # snap
new_pos.setY(int(snaps_y[delta_y[1]]) - self.rect().height())
self.setPos(new_pos) self.setPos(new_pos)
self.window.show_pos(int(self.pos().x()), int(self.pos().y())) self.window.show_pos(int(self.pos().x()), int(self.pos().y()))