Do simple height-flow layout on menu items, and add an add_image() function
This commit is contained in:
		
							parent
							
								
									a8322a76eb
								
							
						
					
					
						commit
						d585a251bd
					
				@ -16,6 +16,7 @@ class Menu(gtk.Window):
 | 
				
			|||||||
		gtk.Window.__init__(self, gtk.WINDOW_POPUP)
 | 
							gtk.Window.__init__(self, gtk.WINDOW_POPUP)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		self._width = 15
 | 
							self._width = 15
 | 
				
			||||||
 | 
							self._height = 0
 | 
				
			||||||
		self._grid = grid
 | 
							self._grid = grid
 | 
				
			||||||
		self._action_box = None
 | 
							self._action_box = None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -31,10 +32,10 @@ class Menu(gtk.Window):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
		text = goocanvas.Text(text=title, font="Sans bold 18",
 | 
							text = goocanvas.Text(text=title, font="Sans bold 18",
 | 
				
			||||||
							  fill_color='white', anchor=gtk.ANCHOR_SW)
 | 
												  fill_color='white', anchor=gtk.ANCHOR_SW)
 | 
				
			||||||
		self._grid.set_constraints(text, 1, 3, self._width, 2)
 | 
							self._grid.set_constraints(text, 1, 3, self._width, self._height)
 | 
				
			||||||
		self._root.add_child(text)
 | 
							self._root.add_child(text)
 | 
				
			||||||
 | 
							self._height += 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		self._height = 4
 | 
					 | 
				
			||||||
		self._update_constraints()
 | 
							self._update_constraints()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		self._canvas.set_model(model)
 | 
							self._canvas.set_model(model)
 | 
				
			||||||
@ -42,23 +43,36 @@ class Menu(gtk.Window):
 | 
				
			|||||||
	def _create_action_box(self):
 | 
						def _create_action_box(self):
 | 
				
			||||||
		separator = goocanvas.Path(data='M 15 0 L 215 0', line_width=3,
 | 
							separator = goocanvas.Path(data='M 15 0 L 215 0', line_width=3,
 | 
				
			||||||
								   stroke_color='white')
 | 
													   stroke_color='white')
 | 
				
			||||||
		self._grid.set_constraints(separator, 0, 4)
 | 
							self._grid.set_constraints(separator, 0, self._height)
 | 
				
			||||||
		self._root.add_child(separator)
 | 
							self._root.add_child(separator)
 | 
				
			||||||
 | 
							self._height += 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		box = CanvasBox(self._grid, CanvasBox.HORIZONTAL)
 | 
							box = CanvasBox(self._grid, CanvasBox.HORIZONTAL)
 | 
				
			||||||
		self._grid.set_constraints(box, 0, 5)
 | 
							self._grid.set_constraints(box, 0, self._height)
 | 
				
			||||||
 | 
							self._height += 5
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		return box
 | 
							return box
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	def get_grid(self):
 | 
						def get_grid(self):
 | 
				
			||||||
		return self._grid
 | 
							return self._grid
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						def add_image(self, image_item, width, height):
 | 
				
			||||||
 | 
							"""width & height in grid units"""
 | 
				
			||||||
 | 
							separator = goocanvas.Path(data='M 15 0 L 215 0', line_width=3,
 | 
				
			||||||
 | 
													   stroke_color='white')
 | 
				
			||||||
 | 
							self._grid.set_constraints(separator, 0, self._height)
 | 
				
			||||||
 | 
							self._root.add_child(separator)
 | 
				
			||||||
 | 
							self._height += 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							self._grid.set_constraints(image_item, x=5, y=self._height, width=width, height=height)
 | 
				
			||||||
 | 
							self._root.add_child(image_item)
 | 
				
			||||||
 | 
							self._height += height
 | 
				
			||||||
 | 
							self._update_constraints()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	def add_action(self, icon, action_id):
 | 
						def add_action(self, icon, action_id):
 | 
				
			||||||
		if self._action_box == None:
 | 
							if self._action_box == None:
 | 
				
			||||||
			self._action_box = self._create_action_box()
 | 
								self._action_box = self._create_action_box()
 | 
				
			||||||
			self._root.add_child(self._action_box)
 | 
								self._root.add_child(self._action_box)
 | 
				
			||||||
 | 
					 | 
				
			||||||
			self._height = 10
 | 
					 | 
				
			||||||
			self._update_constraints()
 | 
								self._update_constraints()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		icon.connect('clicked', self._action_clicked_cb, action_id)
 | 
							icon.connect('clicked', self._action_clicked_cb, action_id)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user