Skip to content

Commit

Permalink
Merge branch 'new-hints'
Browse files Browse the repository at this point in the history
  • Loading branch information
The-Compiler committed Aug 18, 2016
2 parents ea14b5b + 8eaa387 commit 713201a
Show file tree
Hide file tree
Showing 13 changed files with 276 additions and 358 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.asciidoc
Expand Up @@ -42,6 +42,20 @@ Added
Changed
~~~~~~~

- Hints are now drawn natively in Qt instead of using web elements. This has a
few implications for users:
* The `hints -> opacity` setting does not exist anymore, but you can use
`rgba(r, g, b, alpha)` colors instead for `colors -> hints.bg`.
* The `hints -> font` setting is not affected by
`fonts -> web-family-fixed` anymore. Thus, a transformer got added to
change `Monospace` to `${_monospace}`.
* Gradients in hint colors can now be configured by using `qlineargradient`
and friends instead of `-webkit-gradient`. The most common cases get
migrated automatically, but if you drastically changed the defaults,
you'll need to manually adjust your config.
* Styling hints by styling `qutehint` elements in `user-stylesheet` was
never officially supported and does not work anymore.
* Hints are now not affected by the page's stylesheet or zoom anymore.
- `:bookmark-add` now has a `--toggle` flag which deletes the bookmark if it
already exists.
- `:bookmark-load` now has a `--delete` flag which deletes the bookmark after
Expand Down Expand Up @@ -99,6 +113,7 @@ Removed
into a new `:completion-focus {prev,next}` command and thus removed.
- The `ui -> hide-mouse-cursor` setting since it was completely broken and
nobody seemed to care.
- The `hints -> opacity` setting - see the "Changed" section for details.
Fixed
~~~~~
Expand Down
15 changes: 4 additions & 11 deletions doc/help/settings.asciidoc
Expand Up @@ -178,7 +178,6 @@
|==============
|Setting|Description
|<<hints-border,border>>|CSS border value for hints.
|<<hints-opacity,opacity>>|Opacity for hints.
|<<hints-mode,mode>>|Mode to use for hints.
|<<hints-chars,chars>>|Chars used for hint strings.
|<<hints-min-chars,min-chars>>|Minimum number of chars used for hint strings.
Expand Down Expand Up @@ -248,7 +247,7 @@
|<<colors-tabs.indicator.error,tabs.indicator.error>>|Color for the tab indicator on errors..
|<<colors-tabs.indicator.system,tabs.indicator.system>>|Color gradient interpolation system for the tab indicator.
|<<colors-hints.fg,hints.fg>>|Font color for hints.
|<<colors-hints.bg,hints.bg>>|Background color for hints.
|<<colors-hints.bg,hints.bg>>|Background color for hints. Note that you can use a `rgba(...)` value for transparency.
|<<colors-hints.fg.match,hints.fg.match>>|Font color for the matched part of hints.
|<<colors-downloads.bg.bar,downloads.bg.bar>>|Background color for the download bar.
|<<colors-downloads.fg.start,downloads.fg.start>>|Color gradient start for download text.
Expand Down Expand Up @@ -1601,12 +1600,6 @@ CSS border value for hints.

Default: +pass:[1px solid #E3BE23]+

[[hints-opacity]]
=== opacity
Opacity for hints.

Default: +pass:[0.7]+

[[hints-mode]]
=== mode
Mode to use for hints.
Expand Down Expand Up @@ -2052,9 +2045,9 @@ Default: +pass:[black]+

[[colors-hints.bg]]
=== hints.bg
Background color for hints.
Background color for hints. Note that you can use a `rgba(...)` value for transparency.

Default: +pass:[-webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFF785), color-stop(100%,#FFC542))]+
Default: +pass:[qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 247, 133, 0.8), stop:1 rgba(255, 197, 66, 0.8))]+

[[colors-hints.fg.match]]
=== hints.fg.match
Expand Down Expand Up @@ -2201,7 +2194,7 @@ Default: +pass:[8pt ${_monospace}]+
=== hints
Font used for the hints.

Default: +pass:[bold 13px Monospace]+
Default: +pass:[bold 13px ${_monospace}]+

[[fonts-debug-console]]
=== debug-console
Expand Down

0 comments on commit 713201a

Please sign in to comment.