Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
eolie
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
5
Issues
5
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
World
eolie
Commits
e24ac101
Commit
e24ac101
authored
Feb 09, 2019
by
Cédric Bellegarde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rework zoom handler to show real zoom level in menu
parent
24acfc0d
Pipeline
#57774
passed with stage
in 8 minutes and 56 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
15 deletions
+16
-15
extension_proxy.py
eolie/extension_proxy.py
+1
-1
menu_toolbar.py
eolie/menu_toolbar.py
+2
-3
webview.py
eolie/webview.py
+13
-11
No files found.
eolie/extension_proxy.py
View file @
e24ac101
...
...
@@ -53,7 +53,7 @@ class Server:
args
=
list
(
parameters
.
unpack
())
for
i
,
sig
in
enumerate
(
self
.
method_inargs
[
method_name
]):
if
sig
is
'h'
:
if
sig
==
'h'
:
msg
=
invocation
.
get_message
()
fd_list
=
msg
.
get_unix_fd_list
()
args
[
i
]
=
fd_list
.
get
(
args
[
i
])
...
...
eolie/menu_toolbar.py
View file @
e24ac101
...
...
@@ -174,9 +174,8 @@ class ToolbarMenu(Gtk.PopoverMenu):
@param button as Gtk.Button
"""
webview
=
self
.
__window
.
container
.
current
.
webview
App
()
.
websettings
.
set_zoom
(
100
,
webview
.
uri
)
webview
.
update_zoom_level
()
button
.
set_label
(
"100
%
"
)
current
=
webview
.
zoom_default
()
button
.
set_label
(
"{}
%
"
.
format
(
current
))
#######################
# PRIVATE #
...
...
eolie/webview.py
View file @
e24ac101
...
...
@@ -91,19 +91,19 @@ class WebView(WebKit2.WebView):
Update zoom level
"""
try
:
zoom_level
=
App
()
.
websettings
.
get_zoom
(
self
.
uri
)
if
zoom_level
is
None
:
zoom_level
=
100
if
self
.
__related_view
is
None
:
zoom_level
*=
self
.
_window
.
zoom_level
else
:
zoom_level
=
self
.
_window
.
zoom_level
if
self
.
__related_view
is
not
None
:
window
=
self
.
__related_view
.
get_ancestor
(
Gtk
.
Window
)
if
window
is
not
None
and
hasattr
(
window
,
"zoom_level"
):
zoom_level
*=
window
.
zoom_level
zoom_level
=
window
.
zoom_level
else
:
_zoom_level
=
App
()
.
websettings
.
get_zoom
(
self
.
uri
)
/
100
if
_zoom_level
is
not
None
:
zoom_level
=
_zoom_level
except
Exception
as
e
:
Logger
.
error
(
"WebView::update_zoom_level():
%
s"
,
e
)
Logger
.
debug
(
"Update zoom level:
%
s"
,
zoom_level
)
self
.
set_zoom_level
(
zoom_level
/
100
)
self
.
set_zoom_level
(
zoom_level
)
def
print
(
self
):
"""
...
...
@@ -119,7 +119,7 @@ class WebView(WebKit2.WebView):
"""
current
=
App
()
.
websettings
.
get_zoom
(
self
.
uri
)
if
current
is
None
:
current
=
100
current
=
int
(
self
.
_window
.
zoom_level
*
100
)
current
+=
10
App
()
.
websettings
.
set_zoom
(
current
,
self
.
uri
)
self
.
update_zoom_level
()
...
...
@@ -132,7 +132,7 @@ class WebView(WebKit2.WebView):
"""
current
=
App
()
.
websettings
.
get_zoom
(
self
.
uri
)
if
current
is
None
:
current
=
100
current
=
int
(
self
.
_window
.
zoom_level
*
100
)
current
-=
10
if
current
==
0
:
return
10
...
...
@@ -145,8 +145,10 @@ class WebView(WebKit2.WebView):
Reset zoom level
@return current zoom after zoom out
"""
App
()
.
websettings
.
set_zoom
(
100
,
self
.
uri
)
current
=
int
(
self
.
_window
.
zoom_level
*
100
)
App
()
.
websettings
.
set_zoom
(
current
,
self
.
uri
)
self
.
update_zoom_level
()
return
current
def
set_title
(
self
,
title
):
"""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment