stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-10 17:29:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change the $thumb_proportions variable to be a theme callback which

Browse Source 
takes an item as an argument.  This will let us figure out proportions
in the case where a module has defined custom thumbnail sizes.
This commit is contained in:
Bharat Mediratta
2011-03-20 10:25:59 -07:00
parent e4d4a89a1b
commit dc21cf36b6
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/gallery/libraries/Theme_View.php
View File

@@ -42,9 +42,6 @@ class Theme_View_Core extends Gallery_View {
"page_type" => $page_type,
"page_subtype" => $page_subtype,
"page_title" => null));
if ($page_type == "collection") {
$this->set_global("thumb_proportion", $this->thumb_proportion());
}
if (module::get_var("gallery", "maintenance_mode", 0)) {
if (identity::active_user()->admin) {
@@ -58,10 +55,17 @@ class Theme_View_Core extends Gallery_View {
* Proportion of the current thumb_size's to default
* @return int
*/
public function thumb_proportion() {
// @TODO change the 200 to a theme supplied value when and if we come up with an
// API to allow the theme to set defaults.
return module::get_var("gallery", "thumb_size", 200) / 200;
public function thumb_proportion($item) {
// By default we have a globally fixed thumbnail size In core code, we just return a fixed
// proportion based on the global thumbnail size, but since modules can override that, we
// return the actual proportions when we have them.
if ($item->has_thumb()) {
return max($item->thumb_width, $item->thumb_height) / 200;
} else {
// @TODO change the 200 to a theme supplied value when and if we come up with an
// API to allow the theme to set defaults.
return module::get_var("gallery", "thumb_size", 200) / 200;
}
}
public function item() {