branch: elpa/golden-ratio
commit 76f5307ad04eeb912f11d990cc9ec6320afd60a3
Merge: 6173b7c416 26f616f658
Author: Roman Gonzalez <[email protected]>
Commit: Roman Gonzalez <[email protected]>
Merge pull request #43 from EricGebhart/master
scaling of width for wide frames.
---
README.md | 36 ++++++++++++++++++++++++++++++++++++
golden-ratio.el | 42 +++++++++++++++++++++++++++++++++++++++++-
2 files changed, 77 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 65eb80020f..9a7b913bfb 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,42 @@ If you want to disable automatic resizing done by
golden-ratio, just invoke
To call golden ratio manually just `M-x golden-ratio`
+## Wide Screens
+
+If you use a large screen and have very wide frames golden-ratio makes very
+wide windows. This can be handled automatically by setting
_golden-ratio-auto-scale_
+to true. This does a good job of keeping windows at a reasonable width
regardless of
+how wide or narrow your frame size is. This works well on my laptop regardless
of
+which monitor or LCD I happen to be using.
+
+`(setq golden-ratio-auto-scale t)`
+
+For those who wish for manual control,
+If _golden-ratio-auto-scale_ is false, manual control can be exercised
+through the _golden-ratio-adjust-factor_ variable.
+setting it to something less than 1 will cause the windows to be less wide.
+The golden-ratio-adjust function allows for experimentation with this value.
+
+`M-x golden-ratio-adjust`
+
+It is also possible to toggle between widescreen and regular width window
sizing
+with
+
+`M-x golden-ratio-toggle-widescreen`
+
+The variable _golden-ratio-wide-adjust-factor_ can be set to the adjustment
value
+you desire the widescreen toggle to use.
+
+The following code will set up golden-ratio to adjust for a moderately wide
screen
+and also allow toggling between normal, with an adjustment factor of 1, and
wide with
+an adjustment factor of .8. For a very wide screen/frame of ~3400 px, .4 works
well giving
+screens with a width ~100 columns wide.
+
+```elisp
+(setq golden-ratio-adjust-factor .8
+ golden-ratio-wide-adjust-factor .8)
+```
+
## Credits
Code inspired by ideas from [Tatsuhiro Ujihisa](http://twitter.com/ujm)
diff --git a/golden-ratio.el b/golden-ratio.el
index b28e88bb75..2fd65814a6 100644
--- a/golden-ratio.el
+++ b/golden-ratio.el
@@ -62,14 +62,54 @@ will not cause the window to be resized to the golden
ratio."
:group 'golden-ratio
:type 'boolean)
+(defcustom golden-ratio-adjust-factor 1.0
+ "Adjust the width sizing by some factor. 1 is no adjustment.
+ For very wide screens/frames, ie. 3400px, .4 may work well."
+ :group 'golden-ratio
+ :type 'integer)
+
+(defcustom golden-ratio-wide-adjust-factor 0.8
+ "Width adjustment factor for widescreens. Used when
+ toggling between widescreen and regular modes."
+ :group 'golden-ratio
+ :type 'float)
+
+(defcustom golden-ratio-auto-scale nil
+ "Automatic width adjustment factoring. Scales the width
+ of the screens to be smaller as the frame gets bigger."
+ :group 'golden-ratio
+ :type 'boolean)
+
+
;;; Compatibility
;;
(unless (fboundp 'window-resizable-p)
(defalias 'window-resizable-p 'window--resizable-p))
+(defun golden-ratio-toggle-widescreen ()
+ (interactive)
+ (if (= golden-ratio-adjust-factor 1)
+ (setq golden-ratio-adjust-factor golden-ratio-wide-adjust-factor)
+ (setq golden-ratio-adjust-factor 1))
+ (golden-ratio))
+
+(defun golden-ratio-adjust (a)
+ "set the adjustment of window widths."
+ (interactive
+ (list
+ (read-number "Screeen width adjustment factor: "
golden-ratio-adjust-factor)))
+ (setq golden-ratio-adjust-factor a)
+ (golden-ratio))
+
+(defun golden-ratio--scale-factor ()
+ (if golden-ratio-auto-scale
+ (- 1.0 (* (/ (- (frame-width) 100.0) 1000.0) 1.8))
+ golden-ratio-adjust-factor))
+
(defun golden-ratio--dimensions ()
(list (floor (/ (frame-height) golden-ratio--value))
- (floor (/ (frame-width) golden-ratio--value))))
+ (floor (* (/ (frame-width) golden-ratio--value)
+ (golden-ratio--scale-factor)))))
(defun golden-ratio--resize-window (dimensions &optional window)
(with-selected-window (or window (selected-window))
