Skip to content

M
multitouch
Commit 19eeb983 authored by Taddeüs Kroes's avatar Taddeüs Kroes
Browse files
Options

Code cleanup.

parent 78bfae58
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
docs/rules.mk
View file @ 19eeb983
REPORT := report REPORT := report
DIAGRAMS := data/diagrams DIAGRAMS := data/diagrams
PDFLATEX_FLAGS = -halt-on-error -interaction=nonstopmode \ LATEX = TEXINPUTS=$(d):$(b): pdflatex -halt-on-error -interaction=nonstopmode \
-output-directory $(@D) -shell-escape -output-directory $(@D) -shell-escape
LATEX = TEXINPUTS=$(d):$(b): pdflatex $(PDFLATEX_FLAGS)
REF_WARNING := "Rerun to get cross-references right" REF_WARNING := "Rerun to get cross-references right"
.PHONY: docs report .PHONY: docs report
...@@ -22,6 +21,6 @@ $(b)%.pdf: $(d)%.tex ...@@ -22,6 +21,6 @@ $(b)%.pdf: $(d)%.tex
$(b)$(REPORT).pdf: $(d)$(DIAGRAMS).tex $(b)$(REPORT).pdf: $(d)$(DIAGRAMS).tex
$(b)$(REPORT).bbl: $(d)$(REPORT).bib $(b)$(REPORT).bbl: $(d)$(REPORT).bib
BIBINPUTS=$(d) bibtex8 ${@:.bbl=.aux} BIBINPUTS=$(d) bibtex8 $(@:.bbl=.aux)
$(LATEX) $(d)$(REPORT).tex $(LATEX) $(d)$(REPORT).tex
$(LATEX) $(d)$(REPORT).tex $(LATEX) $(d)$(REPORT).tex
src/widgets.py
View file @ 19eeb983
...@@ -48,7 +48,7 @@ class CircularWidget(Widget): ...@@ -48,7 +48,7 @@ class CircularWidget(Widget):
return self.radius return self.radius
def contains_event(self, event): def contains_event(self, event):
return self.distance_to(event.get_touch_object()) <= self.radius return event.get_touch_object().distance_to(self) <= self.radius
class FullscreenWidget(RectangularWidget): class FullscreenWidget(RectangularWidget):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment