daxvena/elemeld - Change VODZCAIINDFQAU6RUV5VBRGJSMCWNMYAQ3ZE56SNBYU2WOSHFOMAC

Fixed focus normalization algorithm

Created by daxvena on March 5, 2016

VODZCAIINDFQAU6RUV5VBRGJSMCWNMYAQ3ZE56SNBYU2WOSHFOMAC

Dependencies

[2] LSQ7OPL7Z5WJDO7ZZS3D4UPMEEWUUF2LNQ3FZUWWFUVZEXA7CIOAC

In channels

main

Change contents

Replacement in src/cluster.rs at line 31 [2.13]

B:BD[2.728] → [2.728:881]

                    let (focus, x, y) = (self.focus, self.pos.x + event.dx, self.pos.y + event.dy);
                    self.refocus(host, focus, x, y);

[2.728]

[2.881]

                    let (focus, x, y, was_focused) =
                        (self.focus,
                         self.pos.x + event.dx,
                         self.pos.y + event.dy,
                         self.locally_focused());
                    
                    self.refocus(host, focus, x, y, was_focused);

Replacement in src/cluster.rs at line 72 [2.13]
B:BD[2.1993] → [2.1993:2033]
```
    fn locally_focused(&self) -> bool {
```
[2.1993]
[2.2033]
```
    pub fn locally_focused(&self) -> bool {
```

Replacement in src/cluster.rs at line 76 [2.13]

B:BD[2.2097] → [2.2097:2176]

    pub fn refocus<H>(&mut self, host: &H, focus: Index, x: i32, y: i32) where

[2.2097]

[2.2176]

    pub fn refocus<H>(&mut self, host: &H, focus: Index, x: i32, y: i32, was_focused: bool) where

Deletion in src/cluster.rs at line 80 [2.13]

B:BD[2.2274] → [2.2274:2333]

        let was_focused = self.locally_focused();

Replacement in src/cluster.rs at line 114 [2.13]

B:BD[2.3373] → [2.3373:3460]

                Some(focus) => return self.normalize_x(focus, x + screen.size.x - 40),

[2.3373]

[2.3460]

                Some(focus) => return self.normalize_x(focus, x + self.screens[focus as usize].size.x - 40),

Replacement in src/cluster.rs at line 130 [2.13]

B:BD[2.3906] → [2.3906:4031]

            match screen.edges.left {
                Some(focus) => return self.normalize_y(focus, y + screen.size.y - 40),

[2.3906]

[2.4031]

            match screen.edges.top {
                Some(focus) => return self.normalize_y(focus, y + self.screens[focus as usize].size.y - 40),

Replacement in src/cluster.rs at line 135 [2.13]

B:BD[2.4126] → [2.4126:4165]

            match screen.edges.right {

[2.4126]

[2.4165]

            match screen.edges.bottom {

Replacement in src/cluster.rs at line 203 [2.13]

B:BD[2.6332] → [2.6332:6378]

    pub fn replace(&mut self, other: &Self) {

[2.6332]

[2.6378]

    pub fn replace<H>(&mut self, host: &H, other: &Self) where
        H: io::HostInterface
    {
        let was_focused = self.locally_focused();

Insertion in src/cluster.rs at line 208 [2.13]

[2.6409]

        let (focus, x, y) =
            (self.focus,
             self.pos.x,
             self.pos.y);
        
        self.refocus(host, focus, x, y, was_focused);

Replacement in src/elemeld.rs at line 58 [2.8294]

B:BD[2.9800] → [2.9800:9856]

                        self.cluster.replace(&cluster);

[2.9800]

[2.9856]

                        self.cluster.replace(&self.host, &cluster);

Replacement in src/elemeld.rs at line 64 [2.8294]

B:BD[2.10029] → [2.10029:10108]

                        self.cluster.refocus(&self.host, focus, pos.x, pos.y);

[2.10029]

[2.10108]

                        let was_focused = self.cluster.locally_focused();
                        self.cluster.refocus(&self.host, focus, pos.x, pos.y, was_focused);