This commit is contained in:
Ross Churchley 2015-07-09 23:09:39 -07:00
parent 1eca1f27f8
commit bf8d202b89
3 changed files with 27 additions and 41 deletions

View File

@ -63,8 +63,20 @@
\pgfkeys{
/metropolis/outer/progressbar/.cd,
.is choice,
none/.code=\setbeamertemplate{frametitle}[plain],
frametitle/.code=\setbeamertemplate{frametitle}[progressbar],
none/.code={%
\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}{
% intentionally empty
}
\defbeamertemplate{frame numbering}{counter}{
\insertframenumber
}
\defbeamertemplate{frame numbering}{none}{}
\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}{%
\begin{beamercolorbox}[%
wd=\textwidth,
ht=3ex,
dp=3ex,
leftskip=0.3cm,
rightskip=0.3cm
]{footline}%
\hfill\usebeamerfont{page number in head/foot}%
\usebeamertemplate*{frame numbering}
\defbeamertemplate{headline}{plain}{}
\defbeamertemplate{footline}{plain}{%
\begin{beamercolorbox}[wd=\textwidth, sep=3ex]{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}[
wd=\paperwidth,
ht=0.4pt,
dp=0pt]{progress bar in head/foot}
\begin{beamercolorbox}[wd=\paperwidth]{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);

View File

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

Binary file not shown.