Merge pull request #40 from Serg-Norseman/users/brigadir/ticket.39-39

Please review topic branch 'users/brigadir/ticket.39-39'
Serg-Norseman · Apr 21, 2016 · 8bd3fde · 8bd3fde
2 parents d209187 + e4bbf7f
commit 8bd3fde
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 26 deletions.
diff --git a/cpp/solution/Makefile/gnumake/Makefile b/cpp/solution/Makefile/gnumake/Makefile
@@ -24,34 +24,34 @@ endif
 .PHONY: all
 all:
 	@CPUCOUNT=`grep -c ^processor /proc/cpuinfo` && set -x && \
-$(MAKE) toolchain=$(icc) platform=$(x86-64) releasetype=$(release) -f arborgvt.mk --jobs $$CPUCOUNT --output-sync
+$(MAKE) toolchain=$(icc) platform=$(x86-64) releasetype=$(release) --file=arborgvt.mk --jobs=$$CPUCOUNT --output-sync=target
 	@CPUCOUNT=`grep -c ^processor /proc/cpuinfo` && set -x && \
-$(MAKE) toolchain=$(icc) platform=$(x86) releasetype=$(release) -f arborgvt.mk --jobs $$CPUCOUNT --output-sync
+$(MAKE) toolchain=$(icc) platform=$(x86) releasetype=$(release) --file=arborgvt.mk --jobs=$$CPUCOUNT --output-sync=target
 	@CPUCOUNT=`grep -c ^processor /proc/cpuinfo` && set -x && \
-$(MAKE) toolchain=$(msvc) platform=$(x86-64) releasetype=$(release) -f arborgvt.mk --jobs $$CPUCOUNT --output-sync
+$(MAKE) toolchain=$(msvc) platform=$(x86-64) releasetype=$(release) --file=arborgvt.mk --jobs=$$CPUCOUNT --output-sync=target
 	@CPUCOUNT=`grep -c ^processor /proc/cpuinfo` && set -x && \
-$(MAKE) toolchain=$(msvc) platform=$(x86) releasetype=$(release) -f arborgvt.mk --jobs $$CPUCOUNT --output-sync
+$(MAKE) toolchain=$(msvc) platform=$(x86) releasetype=$(release) --file=arborgvt.mk --jobs=$$CPUCOUNT --output-sync=target
 ifeq ($(dtsample), $(project))
 	@CPUCOUNT=`grep -c ^processor /proc/cpuinfo` && set -x && \
-$(MAKE) toolchain=$(icc) platform=$(x86-64) releasetype=$(release) -f dtsample.mk --jobs $$CPUCOUNT --output-sync
+$(MAKE) toolchain=$(icc) platform=$(x86-64) releasetype=$(release) --file=dtsample.mk --jobs=$$CPUCOUNT --output-sync=target
 	@CPUCOUNT=`grep -c ^processor /proc/cpuinfo` && set -x && \
-$(MAKE) toolchain=$(icc) platform=$(x86) releasetype=$(release) -f dtsample.mk --jobs $$CPUCOUNT --output-sync
+$(MAKE) toolchain=$(icc) platform=$(x86) releasetype=$(release) --file=dtsample.mk --jobs=$$CPUCOUNT --output-sync=target
 	@CPUCOUNT=`grep -c ^processor /proc/cpuinfo` && set -x && \
-$(MAKE) toolchain=$(msvc) platform=$(x86-64) releasetype=$(release) -f dtsample.mk --jobs $$CPUCOUNT --output-sync
+$(MAKE) toolchain=$(msvc) platform=$(x86-64) releasetype=$(release) --file=dtsample.mk --jobs=$$CPUCOUNT --output-sync=target
 	@CPUCOUNT=`grep -c ^processor /proc/cpuinfo` && set -x && \
-$(MAKE) toolchain=$(msvc) platform=$(x86) releasetype=$(release) -f dtsample.mk --jobs $$CPUCOUNT --output-sync
+$(MAKE) toolchain=$(msvc) platform=$(x86) releasetype=$(release) --file=dtsample.mk --jobs=$$CPUCOUNT --output-sync=target
 endif
 
 .PHONY: clean
 clean:
-	$(MAKE) toolchain=$(icc) platform=$(x86-64) releasetype=$(release) -f arborgvt.mk $@
-	$(MAKE) toolchain=$(icc) platform=$(x86) releasetype=$(release) -f arborgvt.mk $@
-	$(MAKE) toolchain=$(msvc) platform=$(x86-64) releasetype=$(release) -f arborgvt.mk $@
-	$(MAKE) toolchain=$(msvc) platform=$(x86) releasetype=$(release) -f arborgvt.mk $@
+	$(MAKE) toolchain=$(icc) platform=$(x86-64) releasetype=$(release) --file=arborgvt.mk $@
+	$(MAKE) toolchain=$(icc) platform=$(x86) releasetype=$(release) --file=arborgvt.mk $@
+	$(MAKE) toolchain=$(msvc) platform=$(x86-64) releasetype=$(release) --file=arborgvt.mk $@
+	$(MAKE) toolchain=$(msvc) platform=$(x86) releasetype=$(release) --file=arborgvt.mk $@
 # `arborgvt` and `dtsample` use the same `outdir`, therefore it ain't necessary to remove it twice.
 #ifeq ($(dtsample), $(project))
-#	$(MAKE) toolchain=$(icc) platform=$(x86-64) releasetype=$(release) -f dtsample.mk $@
-#	$(MAKE) toolchain=$(icc) platform=$(x86) releasetype=$(release) -f dtsample.mk $@
-#	$(MAKE) toolchain=$(msvc) platform=$(x86-64) releasetype=$(release) -f dtsample.mk $@
-#	$(MAKE) toolchain=$(msvc) platform=$(x86) releasetype=$(release) -f dtsample.mk $@
+#	$(MAKE) toolchain=$(icc) platform=$(x86-64) releasetype=$(release) --file=dtsample.mk $@
+#	$(MAKE) toolchain=$(icc) platform=$(x86) releasetype=$(release) --file=dtsample.mk $@
+#	$(MAKE) toolchain=$(msvc) platform=$(x86-64) releasetype=$(release) --file=dtsample.mk $@
+#	$(MAKE) toolchain=$(msvc) platform=$(x86) releasetype=$(release) --file=dtsample.mk $@
 #endif
diff --git a/cpp/source/arborgvt/ui/window/child/onscreen/graphwnd.cpp b/cpp/source/arborgvt/ui/window/child/onscreen/graphwnd.cpp
@@ -3,10 +3,6 @@
 
 ATLADD_BEGIN
 
-#if !defined(__ICL)
-D2D1_SIZE_F graph_window::m_vertexNameSize = {50.0f, 50.0f};
-#endif
-
 /**
  * Creates this window.
  *
@@ -315,11 +311,13 @@ void graph_window::draw()
     STLADD t_char_unique_ptr_t text {new TCHAR[length]};
     length =
         _stprintf_s(text.get(), length, TEXT("%.4f FPS (%I64i µs per frame)"), fps, durationInMicroseconds.count());
+    D2D1_MATRIX_3X2_F transform;
+    m_direct2DContext->GetTransform(&transform);
     m_direct2DContext->DrawText(
         text.get(),
         length,
         m_framesPerSecondTextFormat.get(),
-        D2D1::RectF(0.0f, 0.0f, targetSize.width, targetSize.height),
+        D2D1::RectF(-transform._31, -transform._32, targetSize.width, targetSize.height),
         m_framesPerSecondBrush.get());
 #endif
     if (m_graph.active())

diff --git a/cpp/source/arborgvt/ui/window/child/onscreen/graphwnd.h b/cpp/source/arborgvt/ui/window/child/onscreen/graphwnd.h
@@ -148,12 +148,7 @@ class graph_window: public child_window_impl<graph_window>
         _In_ std::chrono::high_resolution_clock::duration&& frameTime);
 #endif
 
-#if defined(__ICL)
     static constexpr D2D1_SIZE_F m_vertexNameSize = {50.0f, 50.0f};
-#else
-    // Definition is on the top of graphwnd.cpp file.
-    static D2D1_SIZE_F m_vertexNameSize;
-#endif
     static constexpr float m_arrowLength = 7.75f;
     static constexpr float m_arrowHalfWidth = 1.5f;
     // Value of the `m_margin` depends on size of a vertex area.