From c2ca3c6593fb1ac07c0f5fd66a99d69c2c816170 Mon Sep 17 00:00:00 2001 From: David Roundy Date: Tue, 25 Sep 2007 19:21:17 +0000 Subject: [PATCH] make Accordian use pureLayout. --- Accordion.hs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Accordion.hs b/Accordion.hs index 5bfd77fa..72f9d13c 100644 --- a/Accordion.hs +++ b/Accordion.hs @@ -33,14 +33,9 @@ import Data.Ratio data Accordion a = Accordion deriving ( Read, Show ) instance Layout Accordion Window where - doLayout _ = accordionLayout - -accordionLayout :: Eq a => Rectangle -> W.Stack a -> X ([(a, Rectangle)], Maybe (Accordion a)) -accordionLayout sc ws = return ((zip ups tops) ++ - [(W.focus ws, mainPane)] ++ - (zip dns bottoms) - ,Nothing) - where ups = W.up ws + pureLayout _ sc ws = zip ups tops ++ [(W.focus ws, mainPane)] ++ zip dns bottoms + where + ups = W.up ws dns = W.down ws (top, allButTop) = splitVerticallyBy (1%8 :: Ratio Int) sc (center, bottom) = splitVerticallyBy (6%7 :: Ratio Int) allButTop