Fix #46

beamerouterthememetropolis.dtx

@@ -63,8 +63,20 @@
 \pgfkeys{
   /metropolis/outer/progressbar/.cd,
     .is choice,
-    none/.code=\setbeamertemplate{frametitle}[plain],
+    none/.code={%
-    frametitle/.code=\setbeamertemplate{frametitle}[progressbar],
+      \setbeamertemplate{headline}[plain]
+      \setbeamertemplate{frametitle}[plain]
+      \setbeamertemplate{footline}[plain]
+    },
+    head/.code={\pgfkeys{/metropolis/outer/progressbar=none}
+      \addtobeamertemplate{headline}{}{\usebeamertemplate*{progress bar in head/foot}}
+    },
+    frametitle/.code={\pgfkeys{/metropolis/outer/progressbar=none}
+      \addtobeamertemplate{frametitle}{}{\usebeamertemplate*{progress bar in head/foot}}
+    },
+    foot/.code={\pgfkeys{/metropolis/outer/progressbar=none}
+      \addtobeamertemplate{footline}{}{\usebeamertemplate*{progress bar in head/foot}}
+    },
 }
 %    \end{macrocode}
 % \end{macro}
@@ -110,34 +122,24 @@
 \setbeamertemplate{navigation symbols}{}
 %    \end{macrocode}
 %
-% Template for the frame number. Can be omitted, shown or displayed as a
+% Templates for the frame number. Can be omitted, shown or displayed as a
 % fraction of the total frames.
 %
 %    \begin{macrocode}
-\defbeamertemplate{frame numbering}{none}{
+\defbeamertemplate{frame numbering}{none}{}
-  % intentionally empty
+\defbeamertemplate{frame numbering}{counter}{\insertframenumber}
-}
-\defbeamertemplate{frame numbering}{counter}{
-  \insertframenumber
-}
 \defbeamertemplate{frame numbering}{fraction}{
   \insertframenumber/\inserttotalframenumber
 }
 %    \end{macrocode}
 %
-% The only element in the footline by default is the frame number.
-%
 %    \begin{macrocode}
-\setbeamertemplate{footline}{%
+\defbeamertemplate{headline}{plain}{}
-  \begin{beamercolorbox}[%
+\defbeamertemplate{footline}{plain}{%
-      wd=\textwidth,
+  \begin{beamercolorbox}[wd=\textwidth, sep=3ex]{footline}%
-      ht=3ex,
+    \hfill%
-      dp=3ex,
+    \usebeamerfont{page number in head/foot}%
-      leftskip=0.3cm,
+    \usebeamertemplate*{frame numbering}
-      rightskip=0.3cm
-    ]{footline}%
-  \hfill\usebeamerfont{page number in head/foot}%
-  \usebeamertemplate*{frame numbering}
   \end{beamercolorbox}%
 }
 %    \end{macrocode}
@@ -193,19 +195,6 @@
   \insertframetitle%
   \end{beamercolorbox}%
 }
-\defbeamertemplate{frametitle}{progressbar}{%
-  \nointerlineskip
-  \begin{beamercolorbox}[%
-      wd=\paperwidth,
-      leftskip=0.3cm,
-      rightskip=0.3cm,
-      ht=2.5ex,
-      dp=1.5ex
-    ]{frametitle}
-  \insertframetitle%
-  \end{beamercolorbox}%
-  \usebeamertemplate*{progress bar in head/foot}
-}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -222,10 +211,7 @@
   \setlength{\metropolis@progressinheadfoot}{%
     \paperwidth * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}%
   }%
-  \begin{beamercolorbox}[
+  \begin{beamercolorbox}[wd=\paperwidth]{progress bar in head/foot}
-      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);

mtheme.dtx

@@ -259,9 +259,9 @@ option on every sub-package accordingly.
   additionally.
 }
 
-\DescribeOption{progressbar}{none, frametitle}{none}{
+\DescribeOption{progressbar}{none, head, frametitle, foot}{none}{
-  Setting this option to frametitle adds a progress bar underneath each frame
+  Adds a progress bar to the top of each frame (|head|), the bottom of each
-  title similar to the section progress bar.
+  frame (|foot|), or directly below each frame title (|frametitle|).
 }
 
 \DescribeOption{frametitleformat}{regular, lowercase, uppercase}{lowercase}{