make stacked cycling work with new otk widgets.. not highlighting in the list yet though
This commit is contained in:
parent
b555cd12e7
commit
e72d9d90f9
1 changed files with 20 additions and 24 deletions
|
@ -56,10 +56,8 @@ class _cycledata:
|
||||||
self.cycling = 0
|
self.cycling = 0
|
||||||
|
|
||||||
def createpopup(self):
|
def createpopup(self):
|
||||||
self.style = self.screen.style()
|
self.widget = otk.Widget(self.screen.number(), ob.openbox,
|
||||||
self.widget = otk.Widget(ob.openbox, self.style, otk.Widget.Vertical,
|
otk.Widget.Vertical, 0, 1)
|
||||||
0, self.style.bevelWidth(), 1)
|
|
||||||
self.widget.setTexture(self.style.titlebarFocusBackground())
|
|
||||||
|
|
||||||
def destroypopup(self):
|
def destroypopup(self):
|
||||||
self.menuwidgets = []
|
self.menuwidgets = []
|
||||||
|
@ -101,10 +99,6 @@ class _cycledata:
|
||||||
else: self.clients.append(c)
|
else: self.clients.append(c)
|
||||||
self.clients.extend(iconic_clients)
|
self.clients.extend(iconic_clients)
|
||||||
|
|
||||||
font = self.style.labelFont()
|
|
||||||
longest = 0
|
|
||||||
height = font.height()
|
|
||||||
|
|
||||||
# make the widgets
|
# make the widgets
|
||||||
i = 0
|
i = 0
|
||||||
self.menuwidgets = []
|
self.menuwidgets = []
|
||||||
|
@ -115,12 +109,14 @@ class _cycledata:
|
||||||
self.clients.pop(i)
|
self.clients.pop(i)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
w = otk.FocusLabel(self.widget)
|
w = otk.Label(self.widget)
|
||||||
if current and c.window() == current.window():
|
if current and c.window() == current.window():
|
||||||
self.menupos = i
|
self.menupos = i
|
||||||
w.focus()
|
#w.focus() XXX
|
||||||
|
pass
|
||||||
else:
|
else:
|
||||||
w.unfocus()
|
#w.unfocus() XXX
|
||||||
|
pass
|
||||||
self.menuwidgets.append(w)
|
self.menuwidgets.append(w)
|
||||||
|
|
||||||
if c.iconic(): t = c.iconTitle()
|
if c.iconic(): t = c.iconTitle()
|
||||||
|
@ -128,8 +124,6 @@ class _cycledata:
|
||||||
if len(t) > TITLE_SIZE_LIMIT: # limit the length of titles
|
if len(t) > TITLE_SIZE_LIMIT: # limit the length of titles
|
||||||
t = t[:TITLE_SIZE_LIMIT / 2 - 2] + "..." + \
|
t = t[:TITLE_SIZE_LIMIT / 2 - 2] + "..." + \
|
||||||
t[0 - TITLE_SIZE_LIMIT / 2 - 2:]
|
t[0 - TITLE_SIZE_LIMIT / 2 - 2:]
|
||||||
length = font.measureString(t)
|
|
||||||
if length > longest: longest = length
|
|
||||||
w.setText(t)
|
w.setText(t)
|
||||||
|
|
||||||
i += 1
|
i += 1
|
||||||
|
@ -142,18 +136,20 @@ class _cycledata:
|
||||||
else:
|
else:
|
||||||
self.menupos = oldpos
|
self.menupos = oldpos
|
||||||
|
|
||||||
# fit to the largest item in the menu
|
# find the size for the popup
|
||||||
|
width = 0
|
||||||
|
height = 0
|
||||||
for w in self.menuwidgets:
|
for w in self.menuwidgets:
|
||||||
w.fitSize(longest, height)
|
size = w.minSize()
|
||||||
|
if size.width() > width: width = size.width()
|
||||||
|
height += size.height()
|
||||||
|
|
||||||
# show or hide the list and its child widgets
|
# show or hide the list and its child widgets
|
||||||
if len(self.clients) > 1:
|
if len(self.clients) > 1:
|
||||||
area = self.screeninfo.rect()
|
size = self.screeninfo.size()
|
||||||
self.widget.update()
|
self.widget.resize(otk.Size(width, height))
|
||||||
self.widget.move(area.x() + (area.width() -
|
self.widget.move(otk.Point((size.width() - width) / 2,
|
||||||
self.widget.width()) / 2,
|
(size.height() - height) / 2))
|
||||||
area.y() + (area.height() -
|
|
||||||
self.widget.height()) / 2)
|
|
||||||
self.widget.show(1)
|
self.widget.show(1)
|
||||||
|
|
||||||
def activatetarget(self, final):
|
def activatetarget(self, final):
|
||||||
|
@ -196,7 +192,7 @@ class _cycledata:
|
||||||
|
|
||||||
if not len(self.clients): return # don't both doing anything
|
if not len(self.clients): return # don't both doing anything
|
||||||
|
|
||||||
self.menuwidgets[self.menupos].unfocus()
|
#self.menuwidgets[self.menupos].unfocus() XXX
|
||||||
if forward:
|
if forward:
|
||||||
self.menupos += 1
|
self.menupos += 1
|
||||||
else:
|
else:
|
||||||
|
@ -204,7 +200,7 @@ class _cycledata:
|
||||||
# wrap around
|
# wrap around
|
||||||
if self.menupos < 0: self.menupos = len(self.clients) - 1
|
if self.menupos < 0: self.menupos = len(self.clients) - 1
|
||||||
elif self.menupos >= len(self.clients): self.menupos = 0
|
elif self.menupos >= len(self.clients): self.menupos = 0
|
||||||
self.menuwidgets[self.menupos].focus()
|
#self.menuwidgets[self.menupos].focus() XXX
|
||||||
if ACTIVATE_WHILE_CYCLING:
|
if ACTIVATE_WHILE_CYCLING:
|
||||||
self.activatetarget(0) # activate, but dont deiconify/unshade/raise
|
self.activatetarget(0) # activate, but dont deiconify/unshade/raise
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue