@@ -426,8 +426,10 @@ setMethod(f = "draw",

     #     heatmap_legend_offset = annotation_legend_offset

     # }

-    object@heatmap_legend_param$offset = unit(0, "mm") #heatmap_legend_offset

-    object@annotation_legend_param$offset = unit(0, "mm") #annotation_legend_offset

+    if(is.null(object@heatmap_legend_param$offset))

+        object@heatmap_legend_param$offset = unit(0, "mm") #heatmap_legend_offset

+    if(is.null(object@annotation_legend_param$offset))

+        object@annotation_legend_param$offset = unit(0, "mm") #annotation_legend_offset

     object@ht_list_param$adjust_annotation_extension = adjust_annotation_extension

@@ -101,16 +101,17 @@ setMethod(f = "draw_heatmap_legend",

     annotation_legend_size = object@annotation_legend_param$size

     offset = object@heatmap_legend_param$offset

-    # if(inherits(offset, "character")) {

-    #     if(offset == "annotation_top") {

-    #         i_ht = object@ht_list_param$main_heatmap

-    #         main_ht = object@ht_list[[i_ht]]

-    #         offset = unit(1, "npc") - main_ht@layout$layout_size$column_title_top_height - 

-    #             main_ht@layout$layout_size$column_dend_top_height - 

-    #             (unit(0.5, "npc") + size[2]*0.5)

-    #     } 

-    # }

-    offset = unit(0, "mm")

+    if(inherits(offset, "character")) {

+        if(offset == "annotation_top") {

+            i_ht = object@ht_list_param$main_heatmap

+            main_ht = object@ht_list[[i_ht]]

+            offset = unit(1, "npc") - main_ht@layout$layout_size$column_title_top_height - 

+                main_ht@layout$layout_size$column_dend_top_height - 

+                (unit(0.5, "npc") + size[2]*0.5)

+        } 

+    } else {

+        offset = unit(0, "mm")

+    }

     if(side != annotation_legend_side) {

         y = unit(0.5, "npc")

@@ -293,7 +293,7 @@ draw(anno, test = "heatmap, colors")

 anno = anno_mark(at = c(1:4, 20, 60, 97:100), labels = month.name[1:10], which = "row")

 draw(anno, index = 1:100, test = "anno_mark")

-anno = anno_mark(at = c(1:4, 20, 60, 97:100), labels = month.name[1:10], labels_rot = 30, which = "row")

+anno = anno_mark(at = c(1:4, 20, 60, 97:100), labels = month.name[1:10], labels_rot = 30, which = "column")

 draw(anno, index = 1:100, test = "anno_mark")

 m = matrix(1:1000, byrow = TRUE, nr = 100)