From 7d6d5a46a088f3e40d96225e035d9876c6d8d850 Mon Sep 17 00:00:00 2001 From: Skyler Lehmkuhl Date: Wed, 18 Jan 2012 21:58:16 -0500 Subject: [PATCH 1/2] Added hack for text tools to hide correctly under GTK --- lightningbeam_windows.py | 5 +++-- svlgui.py | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lightningbeam_windows.py b/lightningbeam_windows.py index 6a824e9..a31b6d4 100755 --- a/lightningbeam_windows.py +++ b/lightningbeam_windows.py @@ -300,6 +300,7 @@ class MainWindowOSX: self.tinstancename._int().color = svlgui.Color("#aaaaaa").pygui self.tinstancename._int().mouse_down = self.darkentinstance self.tinstancename.set_action(self.setFontInstanceName) + self.tinstancename.disable() self.textbox.layout_self([self.tgroup[0],10,None,5,None,"nw",""], [self.tgroup[1],10,None,self.tgroup[0]._int(),None,"nw",""], [self.tgroup[2],10,None,self.tgroup[1]._int(),None,"nw",""], @@ -321,8 +322,8 @@ class MainWindowOSX: #[self.timelinebox,self.paintbox._int()+148,-500,0,None,"new","hv"], [self.layerbox,self.toolbox._int(),self.toolbox._int().width+150,0,None,"n","v"], #[self.layerbox,self.paintbox._int(),self.toolbox._int().width+150,0,None,"n","v"], - [self.docbox,self.toolbox._int(),0,None,0,"wse", ""], - [self.textbox,self.toolbox._int(),0,None,0,"wse", ""], + [self.docbox,self.toolbox._int(),0,-200,0,"wse", ""], + [self.textbox,self.toolbox._int(),0,-200,0,"wse", ""], [self.scriptwindow,self.timelinebox._int(),0,0,self.docbox._int(),"nse", "hv"], [self.stage,self.toolbox._int(),self.scriptwindow._int(),self.timelinebox._int()+2,self.docbox._int(),"nsew", "hv"], [self.paintbox,0,self.stage._int(),self.toolbox._int(),None,"nw","v"] ) diff --git a/svlgui.py b/svlgui.py index a6a88fb..123faa9 100644 --- a/svlgui.py +++ b/svlgui.py @@ -170,6 +170,7 @@ if sys.platform=="linux2": #app = GUI.application() SYSTEM="osx" TEMPDIR = "/tmp" + FONT = u'Times New Roman' ''' SYSTEM="html" ids = {} @@ -703,8 +704,14 @@ class Frame(Widget): if SYSTEM=="osx": if visible: self.frame.height = self.height + # Setting the height to 0 doesn't work on Linux, so we hack around it + if PLATFORM.startswith("linux"): + self.frame._gtk_inner_widget.set_visible(True) else: self.frame.height = 0 + if PLATFORM.startswith("linux"): + self.frame._gtk_inner_widget.set_visible(False) + print "visible:",visible class Scale(Widget): def __init__(self,min,val,max): From affb2f3ad5b5370e6d1786482deb86e8e33ef686 Mon Sep 17 00:00:00 2001 From: Skyler Lehmkuhl Date: Wed, 18 Jan 2012 22:38:37 -0500 Subject: [PATCH 2/2] Some progress on HTML5 text --- base.js | 17 +++++++++++++++++ svlgui.py | 3 +++ 2 files changed, 20 insertions(+) diff --git a/base.js b/base.js index 59d34d6..9a4af13 100644 --- a/base.js +++ b/base.js @@ -445,6 +445,23 @@ function Shape() { } } +function TextField() { + /*From the ActionScript reference: + + To create a text field dynamically, you do not use the new operator. + Instead, you use MovieClip.createTextField(). The default size for a + text field is 100 x 100 pixels. + + */ + this._x = 0; + this._y = 0; + this.textHeight = 100; + this.textWidth = 100; + this.text = ""; + this.draw = function(frame,frame2,r) { + + } +} var _rootFrame = new Frame() var _root = new MovieClip() diff --git a/svlgui.py b/svlgui.py index 123faa9..f134f74 100644 --- a/svlgui.py +++ b/svlgui.py @@ -1408,6 +1408,9 @@ class Text (object): +" text=\""+self.text+"\" color="+self.fill.rgb+" size="+str(self.font.size)\ +"pt\n" return retval + def print_html(self): + retval = "var "+self.name+" = new Text();\n"+self.name+".text = \""+self.text+";\n" + return retval class framewrapper (object):