Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix handles becoming invisible after changing highlight color

Browse Source
This commit is contained in:
Kovid Goyal 2020-07-20 10:26:16 +05:30
parent 1f124726c2
commit 561570a897
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pyj/read_book/create_annotation.pyj
View File

@ -372,8 +372,6 @@ class CreateAnnotation:
current_style = self.current_highlight_style current_style = self.current_highlight_style
container.appendChild(c) container.appendChild(c)
found_current = False found_current = False
self.save_handle_state()
self.handle_state = self.left_handle.display, self.right_hand
def add(bg): def add(bg):
ic = svgicon('swatch', BAR_SIZE, BAR_SIZE) ic = svgicon('swatch', BAR_SIZE, BAR_SIZE)
@ -397,8 +395,6 @@ class CreateAnnotation:
def change_color(self, new_color): def change_color(self, new_color):
self.hide_middle() self.hide_middle()
c = self.middle
c.style.display = 'none'
current_style = self.current_highlight_style current_style = self.current_highlight_style
if not new_color or current_style['background-color'].lower() is new_color.lower(): if not new_color or current_style['background-color'].lower() is new_color.lower():
return return
@ -423,7 +419,7 @@ class CreateAnnotation:
def show_middle(self, pre_close_callback): def show_middle(self, pre_close_callback):
self.pre_middle_close_callback = pre_close_callback self.pre_middle_close_callback = pre_close_callback
self.save_handle_state() self.temporarily_hide_handles()
self.middle.style.display = 'block' self.middle.style.display = 'block'
def hide_middle(self): def hide_middle(self):
@ -432,16 +428,17 @@ class CreateAnnotation:
if self.pre_middle_close_callback: if self.pre_middle_close_callback:
if not self.pre_middle_close_callback(): if not self.pre_middle_close_callback():
return return
self.restore_handle_state() self.unhide_handles()
m.style.display = 'none' m.style.display = 'none'
self.container.focus() self.container.focus()
def save_handle_state(self): def temporarily_hide_handles(self):
for h in (self.left_handle, self.right_handle): for h in (self.left_handle, self.right_handle):
if h.style.display is not 'none':
h.dataset.savedState = h.style.display h.dataset.savedState = h.style.display
h.style.display = 'none' h.style.display = 'none'
def restore_handle_state(self): def unhide_handles(self):
for h in (self.left_handle, self.right_handle): for h in (self.left_handle, self.right_handle):
h.style.display = h.dataset.savedState h.style.display = h.dataset.savedState