1
0
mirror of https://github.com/matze/mtheme.git synced 2024-06-28 07:40:52 +02:00

Create common \progressbar command and simplify implementation with calc package.

This commit is contained in:
Ross Churchley 2015-05-20 13:11:50 -07:00
parent aa25c6df4e
commit ebcb4c9be4
2 changed files with 16 additions and 62 deletions

View File

@ -45,7 +45,7 @@
\setbeamercolor{date}{parent=palette primary}
\setbeamercolor{institute}{parent=palette primary}
\setbeamercolor{section title}{parent=palette primary}
\setbeamercolor{section title}{parent=palette secondary}
\setbeamercolor{frametitle}{parent=palette secondary}
\setbeamercolor{background canvas}{parent=palette primary}
\setbeamercolor{structure}{fg=mDarkTeal}

View File

@ -152,66 +152,19 @@
%}}}
%{{{ --- Progressbar ------------------
\makeatletter
\def\progressbar@sectionprogressbar{}
\def\progressbar@titleprogressbar{}
\newcount\progressbar@tmpcounta % auxiliary counter
\newcount\progressbar@tmpcountb % auxiliary counter
\newdimen\progressbar@pbht % progressbar height
\newdimen\progressbar@pbwd % progressbar width
\newdimen\progressbar@tmpdim % auxiliary dimension
\progressbar@pbwd=22em
\progressbar@pbht=0.4pt
% the progress bar
\def\progressbar@sectionprogressbar{%
{\usebeamercolor{palette primary}%
\progressbar@tmpcounta=\insertframenumber
\progressbar@tmpcountb=\inserttotalframenumber
\progressbar@tmpdim=\progressbar@pbwd
\divide\progressbar@tmpdim by 100
\multiply\progressbar@tmpdim by \progressbar@tmpcounta
\divide\progressbar@tmpdim by \progressbar@tmpcountb
\multiply\progressbar@tmpdim by 100
% fixes very high linespacing introduced via \textsc{\MakeLowercase{...}}
\fontsize{1em}{1em}\selectfont
\makebox[\textwidth][c]{
\begin{tikzpicture}[tight background]
\node[anchor=south west, fg, inner sep=0pt, text width=\progressbar@pbwd] at (0pt, 0pt) {\insertsectionHEAD};
\draw[anchor=west, fg!20, fill=fg!20, inner sep=0pt]
(0, -1ex) rectangle ++ (\progressbar@pbwd, \progressbar@pbht);
\draw[anchor=west, fg, fill=fg, inner sep=0pt]
(0, -1ex) rectangle ++ (\progressbar@tmpdim, \progressbar@pbht);
\end{tikzpicture}%
}
} % end usebeamercolor{palette primary}
}
\if@useTitleProgressBar
\def\progressbar@titleprogressbar{%
\progressbar@tmpcounta=\insertframenumber
\progressbar@tmpcountb=\inserttotalframenumber
\progressbar@tmpdim=\paperwidth
\divide\progressbar@tmpdim by 100
\multiply\progressbar@tmpdim by \progressbar@tmpcounta
\divide\progressbar@tmpdim by \progressbar@tmpcountb
\multiply\progressbar@tmpdim by 100
{%
\usebeamercolor{palette quaternary}%
\usebeamercolor{alerted text}%
\begin{tikzpicture}[tight background]
\draw[palette quaternary.fg, fill=palette quaternary.fg] (0, 0) rectangle ($(\paperwidth, 0.6pt) - (0.4pt, 0)$);
\draw[alerted text.fg, fill=alerted text.fg] (0, 0) rectangle (\progressbar@tmpdim, 0.6pt);
\end{tikzpicture}%
\RequirePackage{calc}
\newlength{\progressbar@percent}
\newcommand{\progressbar}[1]{%
\setlength{\progressbar@percent}{%
#1 * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}%
}%
\begin{tikzpicture}
\draw[fg, fill=fg] (0,0) rectangle (#1, 0.4pt);
\draw[alerted text.fg, fill=alerted text.fg] (0,0) rectangle (\progressbar@percent, 0.4pt);
\end{tikzpicture}%
}
\fi
%}}}
%{{{ --- Commands ---------------------
@ -262,7 +215,7 @@
\setbeamercolor{background canvas}{parent=palette primary}
\begin{frame}[plain]
\vspace{2em}\usebeamerfont{section title}
\progressbar@sectionprogressbar%
\progressbar{\textwidth}
\end{frame}
\endgroup
\fi%
@ -320,9 +273,10 @@
\fi%
\end{beamercolorbox}%
\if@useTitleProgressBar
\vspace{-.5em}
\nointerlineskip
\begin{beamercolorbox}[wd=\paperwidth,ht=1pt,dp=0pt]{frametitle}
\progressbar@titleprogressbar
\usebeamercolor{palette quaternary}
\progressbar{\paperwidth}
\end{beamercolorbox}
\fi
\vspace{\@mtheme@voffset}