Thread: [Ocemp-CVS] ocempgui/data/themes/default DefaultEngine.py, 1.6.2.9, 1.6.2.10
Status: Beta
Brought to you by:
marcusva
From: Marcus v. A. <mar...@us...> - 2007-07-11 07:42:05
|
Update of /cvsroot/ocemp/ocempgui/data/themes/default In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31506/data/themes/default Modified Files: Tag: rel_0_2 DefaultEngine.py Log Message: Sync'ed with the changes in HEAD. Index: DefaultEngine.py =================================================================== RCS file: /cvsroot/ocemp/ocempgui/data/themes/default/DefaultEngine.py,v retrieving revision 1.6.2.9 retrieving revision 1.6.2.10 diff -u -d -r1.6.2.9 -r1.6.2.10 --- DefaultEngine.py 23 Mar 2007 11:57:14 -0000 1.6.2.9 +++ DefaultEngine.py 11 Jul 2007 07:42:04 -0000 1.6.2.10 @@ -31,6 +31,11 @@ from ocempgui.widgets.StyleInformation import StyleInformation from ocempgui.widgets.Constants import * + +# Function cache +array3d = pygame.surfarray.array3d +blit_array = pygame.surfarray.blit_array + class DefaultEngine (object): """DefaultEngine (style) -> DefaultEngine @@ -125,7 +130,7 @@ # Maybe pixel3d should be used here, but it does not support 24 # bit color depths. - array = pygame.surfarray.array3d (surface) + array = array3d (surface) # Create the area, the border should surround. # We will use the passed padding for it. @@ -204,7 +209,7 @@ r.top:r.bottom - s:space] = color2 # Blit the new surface. - pygame.surfarray.blit_array (surface, array) + blit_array (surface, array) def draw_dropshadow (self, surface, cls=None, style=None): """D.draw_dropshadow (...) -> None @@ -223,7 +228,7 @@ half = shadow / 2 start = max (half, 3) rect = surface.get_rect () - array = pygame.surfarray.array3d (surface) + array = array3d (surface) # Right and bottom inner shadow. array[rect.left + start:rect.right - half, @@ -237,7 +242,7 @@ array[rect.right - half:rect.right, rect.top + start:rect.bottom] = color[1] - pygame.surfarray.blit_array (surface, array) + blit_array (surface, array) def draw_slider (self, width, height, state, cls=None, style=None): """D.draw_slider (...) -> Surface @@ -341,7 +346,7 @@ color = self.style.get_style_entry (cls, style, "fgcolor", state) rect = surface.get_rect () - array = pygame.surfarray.array3d (surface) + array = array3d (surface) if arrowtype in (ARROW_LEFT, ARROW_RIGHT): arrow_width = rect.width / 3 @@ -377,8 +382,8 @@ array[center - i, row:row - arrow_height + i:-1] = color # Blit the new surface. - pygame.surfarray.blit_array (surface, array) - + blit_array (surface, array) + def draw_check (self, surface, rect, checked, state, cls=None, style=None): """D.draw_check (...) -> None @@ -409,7 +414,7 @@ check = (0, 0, 0) # Check color. sh = (150, 150, 150) # Check shadow to make it look smooth. - array = pygame.surfarray.array3d (surface) + array = array3d (surface) # Draw the borders and fill the rest. dark = self_style.get_style_entry (cls, style, "darkcolor",state) @@ -474,8 +479,9 @@ array[rect.left + 9, rect.top + 4:rect.top + 7] = check array[rect.left + 10, rect.top + 3:rect.top + 6] = check array[rect.left + 11, rect.top + 3:rect.top + 5] = sh - - pygame.surfarray.blit_array (surface, array) + + #self.__checks[style] = + blit_array (surface, array) def draw_radio (self, surface, rect, checked, state, cls=None, style=None): """D.draw_radio (...) -> None @@ -544,7 +550,7 @@ # 8 = border shadow 2 (sh3) # # = check color (check) # - array = pygame.surfarray.array3d (surface) + array = array3d (surface) array[rect.left + 1, rect.top + 5:rect.top + 9] = sh2 array[rect.left + 2, rect.top + 3:rect.top + 5] = sh2 @@ -580,7 +586,7 @@ array[rect.left + 6:rect.left + 9, rect.top + 5] = check array[rect.left + 6:rect.left + 9, rect.top + 9] = check - pygame.surfarray.blit_array (surface, array) + blit_array (surface, array) def draw_caption (self, width, title=None, state=STATE_NORMAL, cls=None, style=None): |