From 26887981fc09c59367d52b8fdc14d6df22f9d809 Mon Sep 17 00:00:00 2001 From: Ross Churchley Date: Thu, 18 Jun 2015 00:23:33 -0700 Subject: [PATCH] Fix progress bar colour regression --- beamercolorthememetropolis.dtx | 15 +++++++++++++-- beamerinnerthememetropolis.dtx | 16 ++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/beamercolorthememetropolis.dtx b/beamercolorthememetropolis.dtx index 3caaced..44b7db6 100644 --- a/beamercolorthememetropolis.dtx +++ b/beamercolorthememetropolis.dtx @@ -118,11 +118,22 @@ % Progress bar and title separator % % \begin{macrocode} -\setbeamercolor{title separator}{use=progress bar, parent=progress bar} +\setbeamercolor{title separator}{ + use=progress bar, + parent=progress bar +} +\setbeamercolor{progress bar in head/foot}{% + use=progress bar, + parent=progress bar +} +\setbeamercolor{progress bar in section page}{ + use=progress bar, + parent=progress bar +} \setbeamercolor{progress bar}{% use=alerted text, fg=alerted text.fg, - bg=normal text.bg!50!fg + bg=normal text.bg!50!normal text.fg } % \end{macrocode} % diff --git a/beamerinnerthememetropolis.dtx b/beamerinnerthememetropolis.dtx index e2eaedd..395427f 100644 --- a/beamerinnerthememetropolis.dtx +++ b/beamerinnerthememetropolis.dtx @@ -31,6 +31,7 @@ % % A |beamer| inner theme dictates the style of the frame elements traditionally % set in the ``body'' of each slide. These include: +% % \begin{itemize} % \item title, part, and section pages; % \item itemize, enumerate, and description environments; @@ -44,6 +45,7 @@ % \subsection{Title page} % % \begin{macro}{title page} +% % Template for the title page. % % \begin{macrocode} @@ -156,8 +158,10 @@ % % \begin{macro}{\maketitle} % \begin{macro}{\titlepage} +% % Inserts the title frame, or causes the current frame to use the % |title page| template. +% % \begin{macrocode} \def\maketitle{% \ifbeamer@inframe @@ -178,7 +182,9 @@ % \subsection{Section page} % % \begin{macro}{section page} +% % Template for the section title slide at the beginning of each section. +% % \begin{macrocode} \setbeamertemplate{section page}{ \vspace{2em} @@ -215,7 +221,11 @@ % \end{macro} % % \begin{macro}{progress bar in section page} +% % Template for the progress bar displayed by default on the section page. +% This code is duplicated in large part in the outer theme's template +% |progress bar in head/foot|. +% % \begin{macrocode} \RequirePackage{calc} \newlength{\metropolis@progressonsectionpage} @@ -223,8 +233,7 @@ \setlength{\metropolis@progressonsectionpage}{% \textwidth * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}% }% - \begin{tikzpicture}[tight background] - \usebeamercolor{progress bar} + \begin{tikzpicture} \draw[bg, fill=bg] (0,0) rectangle (\textwidth, 0.4pt); \draw[fg, fill=fg] (0,0) rectangle (\metropolis@progressonsectionpage, 0.4pt); \end{tikzpicture}% @@ -365,6 +374,9 @@ \setlength{\parskip}{0.5em} \linespread{1.15} % \end{macrocode} +% +% +% % \iffalse % % \fi