diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index d94bc15d09..14b230ae5a 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() diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py index 31eea5060f..5a7057391f 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()