twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-06 23:11:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

DecorationMadness: resizable layouts now use MouseResize too

Browse Source
This commit is contained in:
Andrea Rossato
2008-02-12 17:36:45 +00:00
parent 94b2529999
commit f4fc09b00d
1 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
XMonad/Layout/DecorationMadness.hs
View File

@@ -89,6 +89,7 @@ module XMonad.Layout.DecorationMadness
import Data.List import Data.List
import XMonad import XMonad
import qualified XMonad.StackSet as S import qualified XMonad.StackSet as S
import XMonad.Actions.MouseResize
import XMonad.Layout.Decoration import XMonad.Layout.Decoration
import XMonad.Layout.DwmStyle import XMonad.Layout.DwmStyle
import XMonad.Layout.SimpleDecoration import XMonad.Layout.SimpleDecoration
@@ -191,14 +192,16 @@ circleDeco s t = decoration s t (Simple True) Circle
-- Here you can find a screen shot: -- Here you can find a screen shot:
-- --
-- <http://code.haskell.org/~arossato/xmonadShots/circleSimpleDefaultResizable.png> -- <http://code.haskell.org/~arossato/xmonadShots/circleSimpleDefaultResizable.png>
circleSimpleDefaultResizable :: ModifiedLayout (Decoration DefaultDecoration DefaultShrinker) (ModifiedLayout WindowArranger Circle) Window circleSimpleDefaultResizable :: ModifiedLayout (Decoration DefaultDecoration DefaultShrinker)
circleSimpleDefaultResizable = decoration shrinkText defaultTheme DefaultDecoration (windowArrange Circle) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger Circle)) Window
circleSimpleDefaultResizable = decoration shrinkText defaultTheme DefaultDecoration (mouseResize $ windowArrange Circle)
-- | Similar to 'circleSimpleDefaultResizable' but with the -- | Similar to 'circleSimpleDefaultResizable' but with the
-- possibility of setting a custom shrinker and a custom theme. -- possibility of setting a custom shrinker and a custom theme.
circleDefaultResizable :: Shrinker s => s -> Theme circleDefaultResizable :: Shrinker s => s -> Theme
-> ModifiedLayout (Decoration DefaultDecoration s) (ModifiedLayout WindowArranger Circle) Window -> ModifiedLayout (Decoration DefaultDecoration s)
circleDefaultResizable s t = decoration s t DefaultDecoration (windowArrange Circle) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger Circle)) Window
circleDefaultResizable s t = decoration s t DefaultDecoration (mouseResize $ windowArrange Circle)
-- | A 'Circle' layout with the xmonad simple decoration, default -- | A 'Circle' layout with the xmonad simple decoration, default
-- theme and default shrinker, but with the possibility of moving -- theme and default shrinker, but with the possibility of moving
@@ -207,14 +210,16 @@ circleDefaultResizable s t = decoration s t DefaultDecoration (windowArrange Cir
-- Here you can find a screen shot: -- Here you can find a screen shot:
-- --
-- <http://code.haskell.org/~arossato/xmonadShots/circleSimpleDecoResizable.png> -- <http://code.haskell.org/~arossato/xmonadShots/circleSimpleDecoResizable.png>
circleSimpleDecoResizable :: ModifiedLayout (Decoration SimpleDecoration DefaultShrinker) (ModifiedLayout WindowArranger Circle) Window circleSimpleDecoResizable :: ModifiedLayout (Decoration SimpleDecoration DefaultShrinker)
circleSimpleDecoResizable = decoration shrinkText defaultTheme (Simple True) (windowArrange Circle) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger Circle)) Window
circleSimpleDecoResizable = decoration shrinkText defaultTheme (Simple True) (mouseResize $ windowArrange Circle)
-- | Similar to 'circleSimpleDecoResizable' but with the -- | Similar to 'circleSimpleDecoResizable' but with the
-- possibility of setting a custom shrinker and a custom theme. -- possibility of setting a custom shrinker and a custom theme.
circleDecoResizable :: Shrinker s => s -> Theme circleDecoResizable :: Shrinker s => s -> Theme
-> ModifiedLayout (Decoration SimpleDecoration s) (ModifiedLayout WindowArranger Circle) Window -> ModifiedLayout (Decoration SimpleDecoration s)
circleDecoResizable s t = decoration s t (Simple True) (windowArrange Circle) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger Circle)) Window
circleDecoResizable s t = decoration s t (Simple True) (mouseResize $ windowArrange Circle)
-- | A 'Circle' layout with the xmonad DwmStyle decoration, default -- | A 'Circle' layout with the xmonad DwmStyle decoration, default
-- theme and default shrinker. -- theme and default shrinker.
@@ -284,26 +289,30 @@ accordionDeco s t = decoration s t (Simple True) Accordion
-- | An 'Accordion' layout with the xmonad default decoration, default -- | An 'Accordion' layout with the xmonad default decoration, default
-- theme and default shrinker, but with the possibility of moving -- theme and default shrinker, but with the possibility of moving
-- windows with the mouse, and resize\/move them with the keyboard. -- windows with the mouse, and resize\/move them with the keyboard.
accordionSimpleDefaultResizable :: ModifiedLayout (Decoration DefaultDecoration DefaultShrinker) (ModifiedLayout WindowArranger Accordion) Window accordionSimpleDefaultResizable :: ModifiedLayout (Decoration DefaultDecoration DefaultShrinker)
accordionSimpleDefaultResizable = decoration shrinkText defaultTheme DefaultDecoration (windowArrange Accordion) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger Accordion)) Window
accordionSimpleDefaultResizable = decoration shrinkText defaultTheme DefaultDecoration (mouseResize $ windowArrange Accordion)
-- | Similar to 'accordionSimpleDefaultResizable' but with the -- | Similar to 'accordionSimpleDefaultResizable' but with the
-- possibility of setting a custom shrinker and a custom theme. -- possibility of setting a custom shrinker and a custom theme.
accordionDefaultResizable :: Shrinker s => s -> Theme accordionDefaultResizable :: Shrinker s => s -> Theme
-> ModifiedLayout (Decoration DefaultDecoration s) (ModifiedLayout WindowArranger Accordion) Window -> ModifiedLayout (Decoration DefaultDecoration s)
accordionDefaultResizable s t = decoration s t DefaultDecoration (windowArrange Accordion) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger Accordion)) Window
accordionDefaultResizable s t = decoration s t DefaultDecoration (mouseResize $ windowArrange Accordion)
-- | An 'Accordion' layout with the xmonad simple decoration, default -- | An 'Accordion' layout with the xmonad simple decoration, default
-- theme and default shrinker, but with the possibility of moving -- theme and default shrinker, but with the possibility of moving
-- windows with the mouse, and resize\/move them with the keyboard. -- windows with the mouse, and resize\/move them with the keyboard.
accordionSimpleDecoResizable :: ModifiedLayout (Decoration SimpleDecoration DefaultShrinker) (ModifiedLayout WindowArranger Accordion) Window accordionSimpleDecoResizable :: ModifiedLayout (Decoration SimpleDecoration DefaultShrinker)
accordionSimpleDecoResizable = decoration shrinkText defaultTheme (Simple True) (windowArrange Accordion) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger Accordion)) Window
accordionSimpleDecoResizable = decoration shrinkText defaultTheme (Simple True) (mouseResize $ windowArrange Accordion)
-- | Similar to 'accordionSimpleDecoResizable' but with the -- | Similar to 'accordionSimpleDecoResizable' but with the
-- possibility of setting a custom shrinker and a custom theme. -- possibility of setting a custom shrinker and a custom theme.
accordionDecoResizable :: Shrinker s => s -> Theme accordionDecoResizable :: Shrinker s => s -> Theme
-> ModifiedLayout (Decoration SimpleDecoration s) (ModifiedLayout WindowArranger Accordion) Window -> ModifiedLayout (Decoration SimpleDecoration s)
accordionDecoResizable s t = decoration s t (Simple True) (windowArrange Accordion) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger Accordion)) Window
accordionDecoResizable s t = decoration s t (Simple True) (mouseResize $ windowArrange Accordion)
-- | An 'Accordion' layout with the xmonad DwmStyle decoration, default -- | An 'Accordion' layout with the xmonad DwmStyle decoration, default
-- theme and default shrinker. -- theme and default shrinker.
@@ -380,14 +389,16 @@ tallDeco s t = decoration s t (Simple True) tall
-- Here you can find a screen shot: -- Here you can find a screen shot:
-- --
-- <http://code.haskell.org/~arossato/xmonadShots/tallSimpleDefaultResizable.png> -- <http://code.haskell.org/~arossato/xmonadShots/tallSimpleDefaultResizable.png>
tallSimpleDefaultResizable :: ModifiedLayout (Decoration DefaultDecoration DefaultShrinker) (ModifiedLayout WindowArranger Tall) Window tallSimpleDefaultResizable :: ModifiedLayout (Decoration DefaultDecoration DefaultShrinker)
tallSimpleDefaultResizable = decoration shrinkText defaultTheme DefaultDecoration (windowArrange tall) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger Tall)) Window
tallSimpleDefaultResizable = decoration shrinkText defaultTheme DefaultDecoration (mouseResize $ windowArrange tall)
-- | Similar to 'tallSimpleDefaultResizable' but with the -- | Similar to 'tallSimpleDefaultResizable' but with the
-- possibility of setting a custom shrinker and a custom theme. -- possibility of setting a custom shrinker and a custom theme.
tallDefaultResizable :: Shrinker s => s -> Theme tallDefaultResizable :: Shrinker s => s -> Theme
-> ModifiedLayout (Decoration DefaultDecoration s) (ModifiedLayout WindowArranger Tall) Window -> ModifiedLayout (Decoration DefaultDecoration s)
tallDefaultResizable s t = decoration s t DefaultDecoration (windowArrange tall) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger Tall)) Window
tallDefaultResizable s t = decoration s t DefaultDecoration (mouseResize $ windowArrange tall)
-- | A 'Tall' layout with the xmonad simple decoration, default -- | A 'Tall' layout with the xmonad simple decoration, default
-- theme and default shrinker, but with the possibility of moving -- theme and default shrinker, but with the possibility of moving
@@ -396,14 +407,16 @@ tallDefaultResizable s t = decoration s t DefaultDecoration (windowArrange tall)
-- Here you can find a screen shot: -- Here you can find a screen shot:
-- --
-- <http://code.haskell.org/~arossato/xmonadShots/tallSimpleDecoResizable.png> -- <http://code.haskell.org/~arossato/xmonadShots/tallSimpleDecoResizable.png>
tallSimpleDecoResizable :: ModifiedLayout (Decoration SimpleDecoration DefaultShrinker) (ModifiedLayout WindowArranger Tall) Window tallSimpleDecoResizable :: ModifiedLayout (Decoration SimpleDecoration DefaultShrinker)
tallSimpleDecoResizable = decoration shrinkText defaultTheme (Simple True) (windowArrange tall) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger Tall)) Window
tallSimpleDecoResizable = decoration shrinkText defaultTheme (Simple True) (mouseResize $ windowArrange tall)
-- | Similar to 'tallSimpleDecoResizable' but with the -- | Similar to 'tallSimpleDecoResizable' but with the
-- possibility of setting a custom shrinker and a custom theme. -- possibility of setting a custom shrinker and a custom theme.
tallDecoResizable :: Shrinker s => s -> Theme tallDecoResizable :: Shrinker s => s -> Theme
-> ModifiedLayout (Decoration SimpleDecoration s) (ModifiedLayout WindowArranger Tall) Window -> ModifiedLayout (Decoration SimpleDecoration s)
tallDecoResizable s t = decoration s t (Simple True) (windowArrange tall) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger Tall)) Window
tallDecoResizable s t = decoration s t (Simple True) (mouseResize $ windowArrange tall)
-- | A 'Tall' layout with the xmonad DwmStyle decoration, default -- | A 'Tall' layout with the xmonad DwmStyle decoration, default
-- theme and default shrinker. -- theme and default shrinker.
@@ -479,14 +492,16 @@ mirrorTallDeco s t = decoration s t (Simple True) mirrorTall
-- Here you can find a screen shot: -- Here you can find a screen shot:
-- --
-- <http://code.haskell.org/~arossato/xmonadShots/mirrorTallSimpleDefaultResizable.png> -- <http://code.haskell.org/~arossato/xmonadShots/mirrorTallSimpleDefaultResizable.png>
mirrorTallSimpleDefaultResizable :: ModifiedLayout (Decoration DefaultDecoration DefaultShrinker) (ModifiedLayout WindowArranger (Mirror Tall)) Window mirrorTallSimpleDefaultResizable :: ModifiedLayout (Decoration DefaultDecoration DefaultShrinker)
mirrorTallSimpleDefaultResizable = decoration shrinkText defaultTheme DefaultDecoration (windowArrange mirrorTall) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger (Mirror Tall))) Window
mirrorTallSimpleDefaultResizable = decoration shrinkText defaultTheme DefaultDecoration (mouseResize $ windowArrange mirrorTall)
-- | Similar to 'mirrorTallSimpleDefaultResizable' but with the -- | Similar to 'mirrorTallSimpleDefaultResizable' but with the
-- possibility of setting a custom shrinker and a custom theme. -- possibility of setting a custom shrinker and a custom theme.
mirrorTallDefaultResizable :: Shrinker s => s -> Theme mirrorTallDefaultResizable :: Shrinker s => s -> Theme
-> ModifiedLayout (Decoration DefaultDecoration s) (ModifiedLayout WindowArranger (Mirror Tall)) Window -> ModifiedLayout (Decoration DefaultDecoration s)
mirrorTallDefaultResizable s t = decoration s t DefaultDecoration (windowArrange mirrorTall) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger (Mirror Tall))) Window
mirrorTallDefaultResizable s t = decoration s t DefaultDecoration (mouseResize $ windowArrange mirrorTall)
-- | A 'Mirror Tall' layout with the xmonad simple decoration, default -- | A 'Mirror Tall' layout with the xmonad simple decoration, default
-- theme and default shrinker, but with the possibility of moving -- theme and default shrinker, but with the possibility of moving
@@ -495,14 +510,16 @@ mirrorTallDefaultResizable s t = decoration s t DefaultDecoration (windowArrange
-- Here you can find a screen shot: -- Here you can find a screen shot:
-- --
-- <http://code.haskell.org/~arossato/xmonadShots/mirrorTallSimpleDecoResizable.png> -- <http://code.haskell.org/~arossato/xmonadShots/mirrorTallSimpleDecoResizable.png>
mirrorTallSimpleDecoResizable :: ModifiedLayout (Decoration SimpleDecoration DefaultShrinker) (ModifiedLayout WindowArranger (Mirror Tall)) Window mirrorTallSimpleDecoResizable :: ModifiedLayout (Decoration SimpleDecoration DefaultShrinker)
mirrorTallSimpleDecoResizable = decoration shrinkText defaultTheme (Simple True) (windowArrange mirrorTall) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger (Mirror Tall))) Window
mirrorTallSimpleDecoResizable = decoration shrinkText defaultTheme (Simple True) (mouseResize $ windowArrange mirrorTall)
-- | Similar to 'mirrorTallSimpleDecoResizable' but with the -- | Similar to 'mirrorTallSimpleDecoResizable' but with the
-- possibility of setting a custom shrinker and a custom theme. -- possibility of setting a custom shrinker and a custom theme.
mirrorTallDecoResizable :: Shrinker s => s -> Theme mirrorTallDecoResizable :: Shrinker s => s -> Theme
-> ModifiedLayout (Decoration SimpleDecoration s) (ModifiedLayout WindowArranger (Mirror Tall)) Window -> ModifiedLayout (Decoration SimpleDecoration s)
mirrorTallDecoResizable s t = decoration s t (Simple True) (windowArrange mirrorTall) (ModifiedLayout MouseResize (ModifiedLayout WindowArranger (Mirror Tall))) Window
mirrorTallDecoResizable s t = decoration s t (Simple True) (mouseResize $ windowArrange mirrorTall)
-- | A 'Mirror Tall' layout with the xmonad DwmStyle decoration, default -- | A 'Mirror Tall' layout with the xmonad DwmStyle decoration, default
-- theme and default shrinker. -- theme and default shrinker.
@@ -545,12 +562,12 @@ mirrorTallTabbed s t = decoration s t SimpleTabbed (resizeVertical (fi $ decoHei
-- --
-- <http://code.haskell.org/~arossato/xmonadShots/floatSimpleSimple.png> -- <http://code.haskell.org/~arossato/xmonadShots/floatSimpleSimple.png>
floatSimpleSimple :: ModifiedLayout (Decoration SimpleDecoration DefaultShrinker) floatSimpleSimple :: ModifiedLayout (Decoration SimpleDecoration DefaultShrinker)
(ModifiedLayout WindowArranger SimpleFloat) a (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatSimpleSimple = simpleFloat floatSimpleSimple = simpleFloat
floatSimple :: Shrinker s => s -> Theme -> floatSimple :: Shrinker s => s -> Theme ->
ModifiedLayout (Decoration SimpleDecoration s) ModifiedLayout (Decoration SimpleDecoration s)
(ModifiedLayout WindowArranger SimpleFloat) a (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatSimple = simpleFloat' floatSimple = simpleFloat'
-- | This version is decorated with the 'DefaultDecoration' style. -- | This version is decorated with the 'DefaultDecoration' style.
@@ -559,15 +576,15 @@ floatSimple = simpleFloat'
-- --
-- <http://code.haskell.org/~arossato/xmonadShots/floatSimpleDefault.png> -- <http://code.haskell.org/~arossato/xmonadShots/floatSimpleDefault.png>
floatSimpleDefault :: ModifiedLayout (Decoration DefaultDecoration DefaultShrinker) floatSimpleDefault :: ModifiedLayout (Decoration DefaultDecoration DefaultShrinker)
(ModifiedLayout WindowArranger SimpleFloat) a (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatSimpleDefault = decoration shrinkText defaultTheme DefaultDecoration (windowArrangeAll $ SF 20) floatSimpleDefault = decoration shrinkText defaultTheme DefaultDecoration (mouseResize $ windowArrangeAll $ SF 20)
-- | Same as 'floatSimpleDefault', but with the possibility of setting a -- | Same as 'floatSimpleDefault', but with the possibility of setting a
-- custom shrinker and a custom theme. -- custom shrinker and a custom theme.
floatDefault :: Shrinker s => s -> Theme -> floatDefault :: Shrinker s => s -> Theme ->
ModifiedLayout (Decoration DefaultDecoration s) ModifiedLayout (Decoration DefaultDecoration s)
(ModifiedLayout WindowArranger SimpleFloat) a (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatDefault s c = decoration s c DefaultDecoration (windowArrangeAll $ SF (decoHeight c)) floatDefault s c = decoration s c DefaultDecoration (mouseResize $ windowArrangeAll $ SF (decoHeight c))
-- | This version is decorated with the 'DwmStyle'. Note that this is -- | This version is decorated with the 'DwmStyle'. Note that this is
-- a keyboard only floating layout. -- a keyboard only floating layout.
@@ -576,15 +593,15 @@ floatDefault s c = decoration s c DefaultDecoration (windowArrangeAll $ SF (deco
-- --
-- <http://code.haskell.org/~arossato/xmonadShots/floatSimpleDwmStyle.png> -- <http://code.haskell.org/~arossato/xmonadShots/floatSimpleDwmStyle.png>
floatSimpleDwmStyle :: Eq a => ModifiedLayout (Decoration DwmStyle DefaultShrinker) floatSimpleDwmStyle :: Eq a => ModifiedLayout (Decoration DwmStyle DefaultShrinker)
(ModifiedLayout WindowArranger SimpleFloat) a (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatSimpleDwmStyle = decoration shrinkText defaultTheme Dwm (windowArrangeAll $ SF 20) floatSimpleDwmStyle = decoration shrinkText defaultTheme Dwm (mouseResize $ windowArrangeAll $ SF 20)
-- | Same as 'floatSimpleDwmStyle', but with the possibility of setting a -- | Same as 'floatSimpleDwmStyle', but with the possibility of setting a
-- custom shrinker and a custom theme. -- custom shrinker and a custom theme.
floatDwmStyle :: (Eq a, Shrinker s) => s -> Theme -> floatDwmStyle :: (Eq a, Shrinker s) => s -> Theme ->
ModifiedLayout (Decoration DwmStyle s) ModifiedLayout (Decoration DwmStyle s)
(ModifiedLayout WindowArranger SimpleFloat) a (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatDwmStyle s c = decoration s c Dwm (windowArrangeAll $ SF (decoHeight c)) floatDwmStyle s c = decoration s c Dwm (mouseResize $ windowArrangeAll $ SF (decoHeight c))
-- | This version is decorated with the 'TabbedDecoration' style. -- | This version is decorated with the 'TabbedDecoration' style.
-- | Mouse dragging is somehow weird. -- | Mouse dragging is somehow weird.
@@ -593,12 +610,12 @@ floatDwmStyle s c = decoration s c Dwm (windowArrangeAll $ SF (decoHeight c))
-- --
-- <http://code.haskell.org/~arossato/xmonadShots/floatSimpleTabbed.png> -- <http://code.haskell.org/~arossato/xmonadShots/floatSimpleTabbed.png>
floatSimpleTabbed :: Eq a => ModifiedLayout (Decoration SimpleTabbedDecoration DefaultShrinker) floatSimpleTabbed :: Eq a => ModifiedLayout (Decoration SimpleTabbedDecoration DefaultShrinker)
(ModifiedLayout WindowArranger SimpleFloat) a (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatSimpleTabbed = decoration shrinkText defaultTheme SimpleTabbed (windowArrangeAll $ SF 20) floatSimpleTabbed = decoration shrinkText defaultTheme SimpleTabbed (mouseResize $ windowArrangeAll $ SF 20)
-- | Same as 'floatSimpleTabbed', but with the possibility of setting a -- | Same as 'floatSimpleTabbed', but with the possibility of setting a
-- custom shrinker and a custom theme. -- custom shrinker and a custom theme.
floatTabbed :: (Eq a, Shrinker s) => s -> Theme -> floatTabbed :: (Eq a, Shrinker s) => s -> Theme ->
ModifiedLayout (Decoration SimpleTabbedDecoration s) ModifiedLayout (Decoration SimpleTabbedDecoration s)
(ModifiedLayout WindowArranger SimpleFloat) a (ModifiedLayout MouseResize (ModifiedLayout WindowArranger SimpleFloat)) a
floatTabbed s c = decoration s c SimpleTabbed (windowArrangeAll $ SF (decoHeight c)) floatTabbed s c = decoration s c SimpleTabbed (mouseResize $ windowArrangeAll $ SF (decoHeight c))