Make the frame adapt to screen size again.
Several cleanups. Fixup makefiles
This commit is contained in:
@@ -3,8 +3,8 @@ import gobject
|
||||
import goocanvas
|
||||
|
||||
from frame.BottomPanel import BottomPanel
|
||||
from frame.RightPanel import RightPanel
|
||||
from frame.TopPanel import TopPanel
|
||||
#from frame.RightPanel import RightPanel
|
||||
#from frame.TopPanel import TopPanel
|
||||
from frame.PanelWindow import PanelWindow
|
||||
|
||||
from sugar.canvas.ScreenContainer import ScreenContainer
|
||||
@@ -45,15 +45,13 @@ class Frame:
|
||||
self._screen_container.set_layout(self._screen_layout)
|
||||
|
||||
def _create_window(self, constraints):
|
||||
layout = self._screen_layout
|
||||
|
||||
window = PanelWindow(self._model)
|
||||
layout.set_constraints(window, constraints)
|
||||
self._screen_layout.set_constraints(window, constraints)
|
||||
self._windows.append(window)
|
||||
|
||||
bounds = layout.get_bounds(self._screen_container, constraints)
|
||||
window.get_view().set_bounds(bounds[0], bounds[1],
|
||||
bounds[2], bounds[3])
|
||||
bounds = self._model.get_layout().get_bounds(self._model._root, constraints)
|
||||
window.scale_to_screen()
|
||||
window.set_bounds(constraints)
|
||||
|
||||
def __hide_timeout_cb(self):
|
||||
self.hide()
|
||||
|
||||
@@ -2,7 +2,7 @@ sugardir = $(pkgdatadir)/shell/frame
|
||||
sugar_PYTHON = \
|
||||
__init__.py \
|
||||
RightPanel.py \
|
||||
Panel.py \
|
||||
PanelWindow.py \
|
||||
Frame.py \
|
||||
TopPanel.py \
|
||||
BottomPanel.py
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import gtk
|
||||
|
||||
from sugar.canvas.CanvasWindow import CanvasWindow
|
||||
from sugar.canvas.GridWindow import GridWindow
|
||||
|
||||
class PanelWindow(CanvasWindow):
|
||||
class PanelWindow(GridWindow):
|
||||
def __init__(self, model):
|
||||
CanvasWindow.__init__(self, model)
|
||||
GridWindow.__init__(self, model)
|
||||
|
||||
self.set_decorated(False)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import goocanvas
|
||||
|
||||
from frame.Panel import Panel
|
||||
from frame.PanelWindow import PanelWindow
|
||||
from sugar.canvas.IconItem import IconItem
|
||||
from sugar.canvas.IconColor import IconColor
|
||||
from sugar.presence import PresenceService
|
||||
@@ -152,22 +152,3 @@ class ActionsBar(goocanvas.Group):
|
||||
|
||||
def __chat_clicked_cb(self, item):
|
||||
pass
|
||||
|
||||
class RightPanel(Panel):
|
||||
def __init__(self, shell, friends):
|
||||
Panel.__init__(self)
|
||||
self._shell = shell
|
||||
self._friends = friends
|
||||
|
||||
def construct(self):
|
||||
Panel.construct(self)
|
||||
|
||||
root = self.get_root()
|
||||
|
||||
actions_bar = ActionsBar(self._shell, self.get_width())
|
||||
root.add_child(actions_bar)
|
||||
|
||||
friends_group = FriendsGroup(self._shell, self._friends,
|
||||
self.get_width())
|
||||
friends_group.translate(0, 150)
|
||||
root.add_child(friends_group)
|
||||
|
||||
Reference in New Issue
Block a user