From 109a961e35797656e4e799bfc5131d47d7a91630 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sat, 8 Mar 2014 13:37:21 -0300 Subject: [PATCH 1/2] Draft: Fixed bug in Wire-to-Bspline conversion --- src/Mod/Draft/DraftTools.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index d94bc15d0..14b230ae5 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -3812,12 +3812,12 @@ class WireToBSpline(Modifier): self.Points = self.obj.Points self.closed = self.obj.Closed n = None - if (Draft.getType(self.selection[0]) == 'Wire'): + if (Draft.getType(self.obj) == 'Wire'): n = Draft.makeBSpline(self.Points, self.closed, self.pl) - elif (Draft.getType(self.selection[0]) == 'BSpline'): + elif (Draft.getType(self.obj) == 'BSpline'): n = Draft.makeWire(self.Points, self.closed, self.pl) if n: - Draft.formatObject(n,self.selection[0]) + Draft.formatObject(n,self.obj) else: self.finish() From f9c0abc17670fc098dfe1312c882a2ceef571d04 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Sat, 8 Mar 2014 13:42:18 -0300 Subject: [PATCH 2/2] Start: better scrolling of the description box - issue #1017 --- src/Mod/Start/StartPage/StartPage.py | 30 ++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py index 31eea5060..5a7057391 100644 --- a/src/Mod/Start/StartPage/StartPage.py +++ b/src/Mod/Start/StartPage/StartPage.py @@ -207,6 +207,19 @@ page = """ } } + function scroller() { + desc = document.getElementById("description"); + base = document.getElementById("column").offsetTop; + scro = window.scrollY; + if (scro > base) { + desc.className = "stick"; + } else { + desc.className = ""; + } + } + + document.onmousemove=scroller; + @@ -600,4 +618,4 @@ def handle(): def exportTestFile(): f = open(os.path.expanduser("~")+os.sep+"freecad-startpage.html","wb") f.write(handle()) - f.close() + f.close()