From 7ef38d77c52f4b1d1f67e19149a0025948f253d3 Mon Sep 17 00:00:00 2001
From: Ross Churchley <ross@rosschurchley.com>
Date: Thu, 18 Jun 2015 00:22:50 -0700
Subject: [PATCH] Add frame title, progress bar to outer theme

---
 beamerouterthememetropolis.dtx | 57 ++++++++++++++++++++++++++++++++++
 beamerthemem.dtx               | 23 +-------------
 2 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/beamerouterthememetropolis.dtx b/beamerouterthememetropolis.dtx
index a7e487d..41da12d 100644
--- a/beamerouterthememetropolis.dtx
+++ b/beamerouterthememetropolis.dtx
@@ -71,6 +71,63 @@
 %
 %
 %
+% \subsection{Frametitle}
+%
+% \begin{macro}{frametitle}
+%
+%   Template for the frame title, which is optionally underlined with a
+%   progress bar.
+%
+%    \begin{macrocode}
+\setbeamertemplate{frametitle}{%
+  \nointerlineskip
+  \begin{beamercolorbox}[%
+      wd=\paperwidth,
+      leftskip=0.3cm,
+      rightskip=0.3cm,
+      ht=2.5ex,
+      dp=1.5ex
+    ]{frametitle}
+  \if@protectFrameTitle%
+      \mthemetitleformat{\protect\insertframetitle}%
+  \else%
+      \mthemetitleformat{\insertframetitle}%
+  \fi%
+  \end{beamercolorbox}%
+  \if@useTitleProgressBar
+    \nointerlineskip
+    \usebeamertemplate*{progress bar in head/foot}
+  \fi
+  \vspace{\@mtheme@voffset}
+}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{progress bar in head/foot}
+%
+%   Template for the progress bar optionally displayed below the frame title
+%   on each page. Much of this code is duplicated in the inner theme's template
+%   |progress bar in section page|.
+%
+%    \begin{macrocode}
+\RequirePackage{calc}
+\newlength{\metropolis@progressinheadfoot}
+\setbeamertemplate{progress bar in head/foot}{
+  \setlength{\metropolis@progressinheadfoot}{%
+    \paperwidth * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}%
+  }%
+  \begin{beamercolorbox}[wd=\paperwidth,ht=0.4pt,dp=0pt]{progress bar in head/foot}
+    \begin{tikzpicture}
+      \draw[bg, fill=bg] (0,0) rectangle (\paperwidth, 0.4pt);
+      \draw[fg, fill=fg] (0,0) rectangle (\metropolis@progressinheadfoot, 0.4pt);
+    \end{tikzpicture}%
+  \end{beamercolorbox}
+}
+%    \end{macrocode}
+% \end{macro}
+%
+%
+%
 % \iffalse
 %</package>
 % \fi
diff --git a/beamerthemem.dtx b/beamerthemem.dtx
index e9fe22b..b081b59 100644
--- a/beamerthemem.dtx
+++ b/beamerthemem.dtx
@@ -188,28 +188,7 @@
 %
 %
 %
-% Frametitle
-%
-%    \begin{macrocode}
-\setbeamertemplate{frametitle}{%
-\nointerlineskip
-\begin{beamercolorbox}[wd=\paperwidth,leftskip=0.3cm,rightskip=0.3cm,ht=2.5ex,dp=1.5ex]{frametitle}
-\usebeamerfont{frametitle}%
-\if@protectFrameTitle%
-    \mthemetitleformat{\protect\insertframetitle}%
-\else%
-    \mthemetitleformat{\insertframetitle}%
-\fi%
-\end{beamercolorbox}%
-\if@useTitleProgressBar
-  \nointerlineskip
-  \begin{beamercolorbox}[wd=\paperwidth,ht=0.4pt,dp=0pt]{frametitle}
-    \progressbar{\paperwidth}
-  \end{beamercolorbox}
-\fi
-\vspace{\@mtheme@voffset}
-}
-%    \end{macrocode}
+
 %
 %
 %